enhanced database: map-stuff, credits to lordo