Minor changes to support Redis