2.0.4

Model dependencies rewritten