[FEATURE] Improve support for CLI context
[TASK] Update README