appStateService and appDataFactory added