Add shop order handling