Updated getOrder command and OM classes