Now using datamodel 0.2.0