Initial support for adequeterecord branch