Finished adding support for multiple keys