Updated guardian custody and address flow