Various changes, add two new Method transformations