Add some class to the model and add metadata gestion.