Handlers refactoring