Use original namespaces where possible
to simplify extension connection