Removed display_order from data classes