Add proper User serialization