Added capabilities support