Started working on capabilities support - issue #6