Adds support for multiple keys
Adds test for multiple keys