Added crude context extraction