Moved definitions to CustomHooks class