Add support for keyword views