Converted User types to use serialization