improve default context