API changes and Modella 0.2.0 compatibility.