Improve transformation process