Adds checkbox support