Tweaked Database's Map implementation