Add implicit context with caution