Added new flow and some transformations