Fixed issue about serialization of embedded maps