Fix: Field indexing and namespaces