Little change in the datamodel and some documentation