Add support for keys that are generated on demand