Added checkbox check-state detection support