Updated for changes to Modella v0.1.0