Extract capabilities to separate class
Fix AdaptiveMessageIDs for alphabetical order