added service and supervisor support