enhances namespacing - Issue #5