Remodeled Residence to include user id + refactoring