improved mapper db creations