Added some basic response handling in the application