Builder now looks up correct context