Minor restructuring, added features to Service class