added context endpoints