Add explicit sorting