Fixed missing serialization of new types
Fixed broken in some cases behavior of "base" entries.

Maps with new objects seems to be working correctly now, objects are
correctly initialized with base values even with null input