Add temporary checkbox field support