Added service class