added service and command class