Added databaseOwner and objectQualifier to database calls