Fixed the TODOs in ReplayModule