make_model_moments now takes a string as optional argument