Added Residence support & Updated info