Refactor capabilities support