Add back Record.cc/h