Updated Data, Service Class to Match New DataBase