model ordering improvements