Add capabilities support