added proper embedded maps
merge