updated user and plan model