Add support for multiple keys, and different home structure