Improvements on Orders model