State model refactor