Commit before adjusting State interface