improvement : The entry is now associated to the entry occurrence