Added ordering and descriptions