Added Datamodel and fixed field names