- added middle map
 - corrected serializer