Added parsing for multiple values