Added support for single keys