Improved delegate interface to make selective context overrides easier to setup