Remove todo, in issues
Implement response service hook