Modularize for namespaces.