Expand HookService (#902)