More enhancements to support Redis