Refactored to inject dependency of ResponseMaker.