Use UserContext instead of Session