map in serialization.h
scc bug fix