Support for checkbox added as well