Renamed Service Class