Add curvilinear arrays and merge/rename method calls