ClientOrder table refact