Feat/refactor recorder