Minor changes on RestService class