added support for redis and other changes