Refactoring handlers 325