Use new model export syntax