Code changes to enable use of namespace.