update type classes to allow serialization