Add more ComplexOptCheck validation