Allowing entities to be resorted on demand