AutoarCreate: Reduce unneeded work