Update to Recorder class