Response and ResponseType further cleaned up