Add support for multiple homes