Added database class to return service object