Add explicit activate/deactivate to StateService