Added rewind support