Moved finer grained response methods into seperate class