Improve transforms