Changed User serialization policy