Update to handle new rank & functional group names