Adding more changes to refactoring