Add checkbox support