Fix interface for model definition.