Update to new version of Residence