Re-generating with the correct override existence checks