updated sevice classes with all the methods