Added Rafi's datamodel