Improve default context behavior
Improve default context behavior
Improve short source name behavior