Merge "Refactor to ensure thread safety"