Refactored repsonses, removed extended class