ResponseMessage class refactor 2