Added User Fields and Products
+ Minor changes in json output (added id's)