Updated to use new features in MotionCore