Added map support via database