More complete for State Manager