Added parsing for Boolean and Set types