Revised v0.1 maptype model