Added support for Residence!