Review and add Sort definition