Refactoring Response Handlers, refs #65