Add changes to handle namespaces overrides.