New version
Fix namespaces
Add packagiest support