Fix ordering in models