Add Visibility criterion handler