Updated Service Hooks