Added transformed_label plus other missing things