0.3-rest : rework of entities for db import [in progress]