Add some more op support.