Add order support, primarily so that find_each works