Refactored the Response and Reply Classes