Context component:

- Added tracking log messages
- Minor code improvements

Co-authored-by: Copilot <copilot@github.com>