Slight changes to transformation pipeline.