More work, wrap the DB metadata in a hash to try to avoid an issue on perl 5.12