Completed StateManager Framework