Updated sample order structure