Align arecord types with mapping records ones