Updated version and renamed Model.d to Model._d