Adding support for multiple keys