New version with fix for namespace