Added support for multiple keys