Add +scl and +sub support