Added checkbox fields, add Not supported fields there