Refactored code changes all classes