improving service class