Revamped UserContext
Moved UserContext to its proper place as CallContext