Boolean type and checkbox partial support added