Added checkbox tag support