Updated User and Survey relation