Switch to new v2 part api's