Make capabilities optional
Merging