Added support type EmbeddedMap and fixed some bugs