Added MapType control to the master #4