CR: Nullifying fields and added namespaces.