Added --context flag to override current context