Added map changes for #987 #988 #990 #992