Add Rewind support