Completed #3 by taking advantage of new support for capabilities
protocol.