Added responder-level functionality and unit tests