Prepare for better overrides