Updated for new modella v0.1.0 spec