Add user context selection