Refactored Recorder.