Adapted Service, added more composition classes