Added new fields
Added new fields
Parameterized client