Add initial support for checkbox