Added more refactorings