Added ResidentID to Device