Updated User to support JSON