Add record generator
Merge branch 'record'