Add root context lookup