Added additonal parameter support and field parsing