Use new ServiceStateLogic