Service Class Fixed