Added switch for service