Added support for multi-key