Add support for multi-context content assist