Proper support for add op