Fix unfortunate cut’n’paste
Update models for v0.6