refactor ModelParser for improving rapidity