Remove View.Builder
Use UserContext instead of Session