Updated get_user method