Added primitive check
Added createCheckButtonField method