Added bool support + default values