namespaces fix for DB