Some map datum work

Figured it's easiest to just PR this