Updated map type. Fixed domain data loadinf issue.