enhance a bit the model module