Adding replay support