Use new serializers for entity serialization

Change-Id: I2c6f873dd85480aece28c2bd38d33d21ed51e589