Corrections to model_map
More ignores