Boolean type guessing added