Add logic to support namespace.