added checkbox support