Improve transformations