Initial Service Hook Util refactor