ResponseMessage class refactor