- Initial code for context checking (issue #275)