Added context for the recorder