Added Create() and MakeMap() and test