Added type specific responses
Cleaning up Response