Update to include namespacing capability