Commit before re-architecting