Added support to checkbox and removed logs