Refactoring how response types are handled
Removed syntactic sugar functions