Services hooks functionality and Handlers refactoring