Update for redis support