Updated to support newer Planner5D