Update models to fit the spec