Commit before changing structure to reduce threads