Improved CombinationRegistry, removed CombinationMode