PM-584 : adjust code for new orderstructure