Context check partially implemented