Merge official namespaces and add packages
Add definitions to spec