Add support for keys