Added stuff for map and changing to use UTF16