Changes to simplify NoSQLNamespaceHandler