Moving generation of overrides to more generic location