Additional refactoring