Introduce more generic override mechanism