Updated application state manager