Big change : only use object ids to obtain instances