Adding refactored changes