Update to use sortOrder property