Updated to include Redis components