Add support for Option and Set types