Added map support for new serialization system.