PTS-45 Modularized the curl method(s) in the model