Introduced option-checkbox classes