Add support for capabilities/multiCapabilities