DatabaseExtension improved, misc