[MODIF] Using entry-record pair class.