Add initial support for overrides.