Made some additional changes so that I can mock the server response for the front end