Add user context feature