New changes in AppState module