Added serialization of extended type