Refactored Service classes to remove duplicate methods and minor things
Fixed capability levels