Added better Redis support