Merge "Refactored to ensure thread safety"