Incorporate overrides