Working on services class