Add support for improved collection ordering