Add support for -record()