Better Order validation