Added handling or parameters with multiple fields