Altering structure for class based flow