Changes to use new C++ move parser