More index & task engine isolation.