Added context endpoints