Add docstrings
Implement extended namespaces new numbering