Major Refactor and Residence Resource

Should we allow null here or set the list to empty in case of a null value?