Work on transform module improvements