Refactoring: Choices +Equipment +Supertaxon