Add basic support for new replay mechanism