Changes for refactoring