Add support for watching keys.