Added conditional opline num support