Refactored ifs and method name in model v1.0 converter