Adding service hook for noemit