Switched to tuple indexing in namespaces