changed serlialization handling