Little improvement of declarations of id modules in the Data_model.
Also corrected one type bug.