[WIP] Refactor MSM

change to `fit_method_map`