Added parsing multi-value parameters