diff --git a/tesseract_motion_planners/descartes/CMakeLists.txt b/tesseract_motion_planners/descartes/CMakeLists.txt
index 5eafd22e6a..162839afce 100644
--- a/tesseract_motion_planners/descartes/CMakeLists.txt
+++ b/tesseract_motion_planners/descartes/CMakeLists.txt
@@ -8,11 +8,11 @@ add_library(
   src/descartes_collision.cpp
   src/descartes_collision_edge_evaluator.cpp
   src/descartes_robot_sampler.cpp
-  src/serialize.cpp
-  src/deserialize.cpp
+  src/descartes_solver_config.cpp
   src/descartes_utils.cpp
   src/profile/descartes_profile.cpp
-  src/profile/descartes_default_plan_profile.cpp)
+  src/profile/descartes_default_plan_profile.cpp
+  src/profile/descartes_default_solver_profile.cpp)
 target_link_libraries(
   ${PROJECT_NAME}_descartes
   PUBLIC ${PROJECT_NAME}_core
diff --git a/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/descartes_problem.h b/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/descartes_problem.h
index aaa6c4d489..161992ba42 100644
--- a/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/descartes_problem.h
+++ b/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/descartes_problem.h
@@ -39,6 +39,7 @@ TESSERACT_COMMON_IGNORE_WARNINGS_POP
 #include <tesseract_environment/fwd.h>
 
 #include <tesseract_scene_graph/scene_state.h>
+#include <tesseract_motion_planners/descartes/descartes_solver_config.h>
 
 namespace tesseract_planning
 {
@@ -49,18 +50,11 @@ struct DescartesProblem
   EIGEN_MAKE_ALIGNED_OPERATOR_NEW
   // LCOV_EXCL_STOP
 
-  // These are required for Tesseract to configure Descartes
-  std::shared_ptr<const tesseract_environment::Environment> env;
-  tesseract_scene_graph::SceneState env_state;
+  DescartesSolverConfig solver_config;
 
-  // Kinematic Objects
-  std::shared_ptr<const tesseract_kinematics::KinematicGroup> manip;
-
-  // These are required for descartes
   std::vector<typename descartes_light::EdgeEvaluator<FloatType>::ConstPtr> edge_evaluators{};
   std::vector<typename descartes_light::WaypointSampler<FloatType>::ConstPtr> samplers{};
   std::vector<typename descartes_light::StateEvaluator<FloatType>::ConstPtr> state_evaluators{};
-  int num_threads = static_cast<int>(std::thread::hardware_concurrency());
 };
 using DescartesProblemF = DescartesProblem<float>;
 using DescartesProblemD = DescartesProblem<double>;
diff --git a/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/descartes_solver_config.h b/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/descartes_solver_config.h
new file mode 100644
index 0000000000..06dda8af4b
--- /dev/null
+++ b/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/descartes_solver_config.h
@@ -0,0 +1,49 @@
+/**
+ * @file descartes_solver_config.h
+ * @brief Tesseract Descartes Solver Config
+ *
+ * @author Levi Armstrong
+ * @date June 25, 2020
+ * @version TODO
+ * @bug No known bugs
+ *
+ * @copyright Copyright (c) 2020, Southwest Research Institute
+ *
+ * @par License
+ * Software License Agreement (Apache License)
+ * @par
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * @par
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef TESSERACT_MOTION_PLANNERS_DESCARTES_SOLVER_CONFIG_H
+#define TESSERACT_MOTION_PLANNERS_DESCARTES_SOLVER_CONFIG_H
+
+#include <boost/serialization/access.hpp>
+#include <boost/serialization/export.hpp>
+
+namespace tesseract_planning
+{
+struct DescartesSolverConfig
+{
+  /** @brief Number of threads to use during planning */
+  int num_threads{ 1 };
+
+protected:
+  friend class boost::serialization::access;
+  template <class Archive>
+  void serialize(Archive& ar, const unsigned int);  // NOLINT
+};
+
+}  // namespace tesseract_planning
+
+BOOST_CLASS_EXPORT_KEY(tesseract_planning::DescartesSolverConfig)
+
+#endif  // TESSERACT_MOTION_PLANNERS_DESCARTES_SOLVER_CONFIG_H
diff --git a/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/deserialize.h b/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/deserialize.h
deleted file mode 100644
index d3d6325c77..0000000000
--- a/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/deserialize.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * @file deserialize.h
- * @brief Provide methods for deserialize descartes plans to xml
- *
- * @author Tyler Marr
- * @date August 25, 2020
- * @version TODO
- * @bug No known bugs
- *
- * @copyright Copyright (c) 2020, Southwest Research Institute
- *
- * @par License
- * Software License Agreement (Apache License)
- * @par
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * @par
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef TESSERACT_MOTION_PLANNERS_DESCARTES_DESERIALIZE_H
-#define TESSERACT_MOTION_PLANNERS_DESCARTES_DESERIALIZE_H
-
-#include <tesseract_common/macros.h>
-TESSERACT_COMMON_IGNORE_WARNINGS_PUSH
-#include <string>
-TESSERACT_COMMON_IGNORE_WARNINGS_POP
-
-#include <tesseract_motion_planners/descartes/profile/descartes_default_plan_profile.h>
-
-namespace tinyxml2
-{
-class XMLElement;  // NOLINT
-class XMLDocument;
-}  // namespace tinyxml2
-
-namespace tesseract_planning
-{
-DescartesDefaultPlanProfile<double> descartesPlanParser(const tinyxml2::XMLElement& xml_element);
-
-DescartesDefaultPlanProfile<double> descartesPlanFromXMLElement(const tinyxml2::XMLElement* profile_xml);
-
-DescartesDefaultPlanProfile<double> descartesPlanFromXMLDocument(const tinyxml2::XMLDocument& xml_doc);
-
-DescartesDefaultPlanProfile<double> descartesPlanFromXMLFile(const std::string& file_path);
-
-DescartesDefaultPlanProfile<double> descartesPlanFromXMLString(const std::string& xml_string);
-
-}  // namespace tesseract_planning
-
-#endif  // TESSERACT_MOTION_PLANNERS_DESCARTES_DESERIALIZE_H
diff --git a/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/impl/descartes_motion_planner.hpp b/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/impl/descartes_motion_planner.hpp
index ade84d6c14..53a50e65c3 100644
--- a/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/impl/descartes_motion_planner.hpp
+++ b/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/impl/descartes_motion_planner.hpp
@@ -40,6 +40,7 @@ TESSERACT_COMMON_IGNORE_WARNINGS_POP
 
 #include <tesseract_motion_planners/descartes/descartes_motion_planner.h>
 #include <tesseract_motion_planners/descartes/profile/descartes_default_plan_profile.h>
+#include <tesseract_motion_planners/descartes/profile/descartes_default_solver_profile.h>
 #include <tesseract_motion_planners/core/types.h>
 #include <tesseract_motion_planners/simple/interpolation.h>
 #include <tesseract_motion_planners/planner_utils.h>
@@ -85,7 +86,7 @@ PlannerResponse DescartesMotionPlanner<FloatType>::solve(const PlannerRequest& r
   descartes_light::SearchResult<FloatType> descartes_result;
   try
   {
-    descartes_light::LadderGraphSolver<FloatType> solver(problem->num_threads);
+    descartes_light::LadderGraphSolver<FloatType> solver(problem->solver_config.num_threads);
 
     // Build Graph
     if (!solver.build(problem->samplers, problem->edge_evaluators, problem->state_evaluators))
@@ -125,8 +126,16 @@ PlannerResponse DescartesMotionPlanner<FloatType>::solve(const PlannerRequest& r
     return response;
   }
 
-  const std::vector<std::string> joint_names = problem->manip->getJointNames();
-  const Eigen::MatrixX2d joint_limits = problem->manip->getLimits().joint_limits;
+  assert(!request.instructions.getManipulatorInfo().empty());
+  const tesseract_common::ManipulatorInfo& composite_mi = request.instructions.getManipulatorInfo();
+
+  if (composite_mi.manipulator.empty())
+    throw std::runtime_error("Descartes, manipulator is empty!");
+
+  // Get Manipulator Information
+  tesseract_kinematics::JointGroup::UPtr manip = request.env->getJointGroup(composite_mi.manipulator);
+  const std::vector<std::string> joint_names = manip->getJointNames();
+  const Eigen::MatrixX2d joint_limits = manip->getLimits().joint_limits;
 
   // Enforce limits
   std::vector<Eigen::VectorXd> solution{};
@@ -233,98 +242,57 @@ DescartesMotionPlanner<FloatType>::createProblem(const PlannerRequest& request)
   prob->samplers.clear();
   prob->state_evaluators.clear();
 
-  // Assume all the plan instructions have the same manipulator as the composite
-  assert(!request.instructions.getManipulatorInfo().empty());
-  const tesseract_common::ManipulatorInfo& composite_mi = request.instructions.getManipulatorInfo();
-
-  if (composite_mi.manipulator.empty())
-    throw std::runtime_error("Descartes, manipulator is empty!");
-
-  // Get Manipulator Information
-  try
-  {
-    if (composite_mi.manipulator_ik_solver.empty())
-      prob->manip = request.env->getKinematicGroup(composite_mi.manipulator);
-    else
-      prob->manip = request.env->getKinematicGroup(composite_mi.manipulator, composite_mi.manipulator_ik_solver);
-  }
-  catch (...)
-  {
-    throw std::runtime_error("Descartes problem generator failed to create kinematic group!");
-  }
-
-  if (!prob->manip)
-  {
-    CONSOLE_BRIDGE_logError("No Kinematics Group found");
-    return prob;
-  }
-
-  prob->env = request.env;
-  prob->env_state = request.env->getState();
-
-  std::vector<std::string> joint_names = prob->manip->getJointNames();
+  // Get solver config
+  auto solver_profile =
+      getProfile<DescartesSolverProfile<FloatType>>(name_,
+                                                    request.instructions.getProfile(name_),
+                                                    *request.profiles,
+                                                    std::make_shared<DescartesDefaultSolverProfile<FloatType>>());
+  prob->solver_config = solver_profile->createSolverConfig(request.instructions, *request.env);
 
   // Flatten the input for planning
   auto move_instructions = request.instructions.flatten(&moveFilter);
 
   // Transform plan instructions into descartes samplers
   int index = 0;
-  for (const auto& move_instruction : move_instructions)
+  for (const auto& instruction : move_instructions)
   {
-    const auto& instruction = move_instruction.get();
-
-    assert(instruction.isMoveInstruction());
-    const auto& plan_instruction = instruction.template as<MoveInstructionPoly>();
+    assert(instruction.get().isMoveInstruction());
+    const auto& move_instruction = instruction.get().template as<MoveInstructionPoly>();
 
     // If plan instruction has manipulator information then use it over the one provided by the composite.
-    tesseract_common::ManipulatorInfo mi = composite_mi.getCombined(plan_instruction.getManipulatorInfo());
+    tesseract_common::ManipulatorInfo manip_info =
+        request.instructions.getManipulatorInfo().getCombined(move_instruction.getManipulatorInfo());
 
-    if (mi.manipulator.empty())
+    if (manip_info.manipulator.empty())
       throw std::runtime_error("Descartes, manipulator is empty!");
 
-    if (mi.tcp_frame.empty())
+    if (manip_info.tcp_frame.empty())
       throw std::runtime_error("Descartes, tcp_frame is empty!");
 
-    if (mi.working_frame.empty())
+    if (manip_info.working_frame.empty())
       throw std::runtime_error("Descartes, working_frame is empty!");
 
     // Get Plan Profile
     auto cur_plan_profile =
         getProfile<DescartesPlanProfile<FloatType>>(name_,
-                                                    plan_instruction.getProfile(name_),
+                                                    move_instruction.getProfile(name_),
                                                     *request.profiles,
                                                     std::make_shared<DescartesDefaultPlanProfile<FloatType>>());
 
     if (!cur_plan_profile)
       throw std::runtime_error("DescartesMotionPlanner: Invalid profile");
 
-    if (plan_instruction.getWaypoint().isCartesianWaypoint())
-    {
-      const auto& cur_wp = plan_instruction.getWaypoint().template as<CartesianWaypointPoly>();
-      cur_plan_profile->apply(*prob, cur_wp.getTransform(), plan_instruction, composite_mi, index);
-      ++index;
-    }
-    else if (plan_instruction.getWaypoint().isJointWaypoint())
-    {
-      if (plan_instruction.getWaypoint().as<JointWaypointPoly>().isConstrained())
-      {
-        assert(checkJointPositionFormat(joint_names, plan_instruction.getWaypoint()));
-        const Eigen::VectorXd& cur_position = getJointPosition(plan_instruction.getWaypoint());
-        cur_plan_profile->apply(*prob, cur_position, plan_instruction, composite_mi, index);
-        ++index;
-      }
-    }
-    else if (plan_instruction.getWaypoint().isStateWaypoint())
-    {
-      assert(checkJointPositionFormat(joint_names, plan_instruction.getWaypoint()));
-      const Eigen::VectorXd& cur_position = getJointPosition(plan_instruction.getWaypoint());
-      cur_plan_profile->apply(*prob, cur_position, plan_instruction, composite_mi, index);
-      ++index;
-    }
-    else
-    {
-      throw std::runtime_error("DescartesMotionPlanner: unknown waypoint type");
-    }
+    if (move_instruction.getWaypoint().isJointWaypoint() &&
+        !move_instruction.getWaypoint().as<JointWaypointPoly>().isConstrained())
+      continue;
+
+    prob->samplers.push_back(cur_plan_profile->createWaypointSampler(move_instruction, manip_info, request.env));
+    prob->state_evaluators.push_back(cur_plan_profile->createStateEvaluator(move_instruction, manip_info, request.env));
+    if (index != 0)
+      prob->edge_evaluators.push_back(cur_plan_profile->createEdgeEvaluator(move_instruction, manip_info, request.env));
+
+    ++index;
   }
 
   // Call the base class generate which checks the problem to make sure everything is in order
diff --git a/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/impl/profile/descartes_default_plan_profile.hpp b/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/impl/profile/descartes_default_plan_profile.hpp
index ba298bee38..bb9354a15c 100644
--- a/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/impl/profile/descartes_default_plan_profile.hpp
+++ b/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/impl/profile/descartes_default_plan_profile.hpp
@@ -28,13 +28,14 @@
 
 #include <tesseract_common/macros.h>
 TESSERACT_COMMON_IGNORE_WARNINGS_PUSH
-#include <tinyxml2.h>
 #include <descartes_light/edge_evaluators/euclidean_distance_edge_evaluator.h>
 #include <descartes_light/edge_evaluators/compound_edge_evaluator.h>
 #include <descartes_light/samplers/fixed_joint_waypoint_sampler.h>
 TESSERACT_COMMON_IGNORE_WARNINGS_POP
 
+#include <tesseract_motion_planners/core/types.h>
 #include <tesseract_motion_planners/descartes/profile/descartes_default_plan_profile.h>
+#include <tesseract_motion_planners/descartes/impl/profile/descartes_profile.hpp>
 #include <tesseract_motion_planners/descartes/descartes_robot_sampler.h>
 #include <tesseract_motion_planners/descartes/descartes_collision.h>
 #include <tesseract_motion_planners/descartes/descartes_collision_edge_evaluator.h>
@@ -44,150 +45,50 @@ TESSERACT_COMMON_IGNORE_WARNINGS_POP
 #include <tesseract_kinematics/core/kinematic_group.h>
 #include <tesseract_environment/environment.h>
 #include <tesseract_command_language/poly/move_instruction_poly.h>
+#include <tesseract_command_language/poly/cartesian_waypoint_poly.h>
+#include <tesseract_command_language/utils.h>
 
 namespace tesseract_planning
 {
 template <typename FloatType>
-DescartesDefaultPlanProfile<FloatType>::DescartesDefaultPlanProfile(const tinyxml2::XMLElement& xml_element)
+std::unique_ptr<DescartesVertexEvaluator> DescartesDefaultPlanProfile<FloatType>::createVertexEvaluator(
+    const MoveInstructionPoly& /*move_instruction*/,
+    const std::shared_ptr<const tesseract_kinematics::KinematicGroup>& manip,
+    const std::shared_ptr<const tesseract_environment::Environment>& /*env*/) const
 {
-  const tinyxml2::XMLElement* vertex_collisions_element = xml_element.FirstChildElement("VertexCollisions");
-  const tinyxml2::XMLElement* edge_collisions_element = xml_element.FirstChildElement("EdgeCollisions");
-  const tinyxml2::XMLElement* num_threads_element = xml_element.FirstChildElement("NumberThreads");
-  const tinyxml2::XMLElement* allow_collisions_element = xml_element.FirstChildElement("AllowCollisions");
-  const tinyxml2::XMLElement* debug_element = xml_element.FirstChildElement("Debug");
-
-  int status{ tinyxml2::XMLError::XML_SUCCESS };
-
-  if (vertex_collisions_element != nullptr)
-  {
-    const tinyxml2::XMLElement* enabled_element = vertex_collisions_element->FirstChildElement("Enabled");
-    //    const tinyxml2::XMLElement* coll_safety_margin_element =
-    //    vertex_collisions_element->FirstChildElement("CollisionSaf"
-    //                                                                                                          "etyMargin");
-
-    if (enabled_element != nullptr)
-    {
-      status = enabled_element->QueryBoolText(&enable_collision);
-      if (status != tinyxml2::XML_NO_ATTRIBUTE && status != tinyxml2::XML_SUCCESS)
-        throw std::runtime_error("DescartesPlanProfile: VertexCollisions: Error parsing Enabled string");
-    }
-
-    /** @todo Update XML */
-    //    if (coll_safety_margin_element)
-    //    {
-    //      std::string coll_safety_margin_string;
-    //      status = tesseract_common::QueryStringText(coll_safety_margin_element, coll_safety_margin_string);
-    //      if (status != tinyxml2::XML_NO_ATTRIBUTE && status != tinyxml2::XML_SUCCESS)
-    //        throw std::runtime_error("DescartesPlanProfile: VertexCollisions:: Error parsing CollisionSafetyMargin
-    //        string");
-
-    //      if (!tesseract_common::isNumeric(coll_safety_margin_string))
-    //        throw std::runtime_error("DescartesPlanProfile: VertexCollisions:: CollisionSafetyMargin is not a numeric
-    //        "
-    //                                 "values.");
-
-    //      tesseract_common::toNumeric<double>(coll_safety_margin_string, collision_safety_margin);
-    //    }
-  }
-
-  if (edge_collisions_element != nullptr)
-  {
-    const tinyxml2::XMLElement* enabled_element = edge_collisions_element->FirstChildElement("Enabled");
-    const tinyxml2::XMLElement* coll_safety_margin_element = edge_collisions_element->FirstChildElement("CollisionSafet"
-                                                                                                        "yMargin");
-    const tinyxml2::XMLElement* long_valid_seg_len_element = edge_collisions_element->FirstChildElement("LongestValidSe"
-                                                                                                        "gmentLength");
-
-    if (enabled_element != nullptr)
-    {
-      status = enabled_element->QueryBoolText(&enable_edge_collision);
-      if (status != tinyxml2::XML_NO_ATTRIBUTE && status != tinyxml2::XML_SUCCESS)
-        throw std::runtime_error("DescartesPlanProfile: EdgeCollisions: Error parsing Enabled string");
-    }
-
-    if (coll_safety_margin_element != nullptr)
-    {
-      std::string coll_safety_margin_string;
-      status = tesseract_common::QueryStringText(coll_safety_margin_element, coll_safety_margin_string);
-      if (status != tinyxml2::XML_NO_ATTRIBUTE && status != tinyxml2::XML_SUCCESS)
-        throw std::runtime_error("DescartesPlanProfile: EdgeCollisions: Error parsing CollisionSafetyMargin string");
-
-      if (!tesseract_common::isNumeric(coll_safety_margin_string))
-        throw std::runtime_error("DescartesPlanProfile: EdgeCollisions: CollisionSafetyMargin is not a numeric "
-                                 "values.");
-
-      /** @todo Update XML */
-      //      tesseract_common::toNumeric<double>(coll_safety_margin_string, edge_collision_saftey_margin);
-    }
-
-    if (long_valid_seg_len_element != nullptr)
-    {
-      std::string long_valid_seg_len_string;
-      status = tesseract_common::QueryStringText(long_valid_seg_len_element, long_valid_seg_len_string);
-      if (status != tinyxml2::XML_NO_ATTRIBUTE && status != tinyxml2::XML_SUCCESS)
-        throw std::runtime_error("DescartesPlanProfile: EdgeCollisions: Error parsing LongestValidSegmentLength "
-                                 "string");
-
-      if (!tesseract_common::isNumeric(long_valid_seg_len_string))
-        throw std::runtime_error("DescartesPlanProfile: EdgeCollisions: LongestValidSegmentLength is not a numeric "
-                                 "values.");
-
-      /** @todo Update XML */
-      //      tesseract_common::toNumeric<double>(long_valid_seg_len_string, edge_longest_valid_segment_length);
-    }
-  }
-
-  if (num_threads_element != nullptr)
-  {
-    std::string num_threads_string;
-    status = tesseract_common::QueryStringText(num_threads_element, num_threads_string);
-    if (status != tinyxml2::XML_NO_ATTRIBUTE && status != tinyxml2::XML_SUCCESS)
-      throw std::runtime_error("DescartesPlanProfile: Error parsing NumberThreads string");
-
-    if (!tesseract_common::isNumeric(num_threads_string))
-      throw std::runtime_error("DescartesPlanProfile: NumberThreads is not a numeric values.");
-
-    tesseract_common::toNumeric<int>(num_threads_string, num_threads);
-  }
-
-  if (allow_collisions_element != nullptr)
-  {
-    status = allow_collisions_element->QueryBoolText(&allow_collision);
-    if (status != tinyxml2::XML_NO_ATTRIBUTE && status != tinyxml2::XML_SUCCESS)
-      throw std::runtime_error("DescartesPlanProfile: Error parsing AllowCollisions string");
-  }
-
-  if (debug_element != nullptr)
-  {
-    status = debug_element->QueryBoolText(&debug);
-    if (status != tinyxml2::XML_NO_ATTRIBUTE && status != tinyxml2::XML_SUCCESS)
-      throw std::runtime_error("DescartesPlanProfile: Error parsing Debug string");
-  }
+  return std::make_unique<DescartesJointLimitsVertexEvaluator>(manip->getLimits().joint_limits);
 }
 
 template <typename FloatType>
-void DescartesDefaultPlanProfile<FloatType>::apply(DescartesProblem<FloatType>& prob,
-                                                   const Eigen::Isometry3d& cartesian_waypoint,
-                                                   const InstructionPoly& parent_instruction,
-                                                   const tesseract_common::ManipulatorInfo& manip_info,
-                                                   int index) const
+PoseSamplerFn DescartesDefaultPlanProfile<FloatType>::createPoseSampler(
+    const MoveInstructionPoly& /*move_instruction*/,
+    const std::shared_ptr<const tesseract_kinematics::KinematicGroup>& /*manip*/,
+    const std::shared_ptr<const tesseract_environment::Environment>& /*env*/) const
 {
-  assert(parent_instruction.isMoveInstruction());
-  const auto& base_instruction = parent_instruction.as<MoveInstructionPoly>();
-  assert(!(manip_info.empty() && base_instruction.getManipulatorInfo().empty()));
-  tesseract_common::ManipulatorInfo mi = manip_info.getCombined(base_instruction.getManipulatorInfo());
-
-  if (mi.manipulator.empty())
-    throw std::runtime_error("Descartes, manipulator is empty!");
+  if (target_pose_fixed)
+    return sampleFixed;
 
-  if (mi.tcp_frame.empty())
-    throw std::runtime_error("Descartes, tcp_frame is empty!");
+  return [axis = target_pose_sample_axis, resolution = target_pose_sample_resolution](
+             const Eigen::Isometry3d& tool_pose) { return sampleToolAxis(tool_pose, resolution, axis); };
+}
 
-  if (mi.working_frame.empty())
-    throw std::runtime_error("Descartes, working_frame is empty!");
+template <typename FloatType>
+std::unique_ptr<descartes_light::WaypointSampler<FloatType>>
+DescartesDefaultPlanProfile<FloatType>::createWaypointSampler(
+    const MoveInstructionPoly& move_instruction,
+    const tesseract_common::ManipulatorInfo& manip_info,
+    const std::shared_ptr<const tesseract_environment::Environment>& env) const
+{
+  auto manip = DescartesPlanProfile<FloatType>::createKinematicGroup(manip_info, *env);
+  if (!move_instruction.getWaypoint().isCartesianWaypoint())
+  {
+    assert(checkJointPositionFormat(manip->getJointNames(), move_instruction.getWaypoint()));
+    const Eigen::VectorXd& joint_waypoint = getJointPosition(move_instruction.getWaypoint());
+    auto state = std::make_shared<descartes_light::State<FloatType>>(joint_waypoint.cast<FloatType>());
+    return std::make_unique<descartes_light::FixedJointWaypointSampler<FloatType>>(state);
+  }
 
-  Eigen::Isometry3d tcp_offset = prob.env->findTCPOffset(mi);
-  std::vector<std::string> joint_names = prob.manip->getJointNames();
+  Eigen::Isometry3d tcp_offset = env->findTCPOffset(manip_info);
 
   /* Check if this cartesian waypoint is dynamic
    * (i.e. defined relative to a frame that will move with the kinematic chain) */
@@ -199,182 +100,64 @@ void DescartesDefaultPlanProfile<FloatType>::apply(DescartesProblem<FloatType>&
 
   DescartesCollision::Ptr ci = nullptr;
   if (enable_collision)
-    ci = std::make_shared<DescartesCollision>(*prob.env, prob.manip, vertex_collision_check_config, debug);
-
-  // Add vertex evaluator
-  std::shared_ptr<descartes_light::WaypointSampler<FloatType>> sampler;
-  if (vertex_evaluator == nullptr)
-  {
-    auto ve = std::make_shared<DescartesJointLimitsVertexEvaluator>(prob.manip->getLimits().joint_limits);
-    sampler = std::make_shared<DescartesRobotSampler<FloatType>>(mi.working_frame,
-                                                                 cartesian_waypoint,
-                                                                 target_pose_sampler,
-                                                                 prob.manip,
-                                                                 ci,
-                                                                 mi.tcp_frame,
-                                                                 tcp_offset,
-                                                                 allow_collision,
-                                                                 ve,
-                                                                 use_redundant_joint_solutions);
-  }
-  else
-  {
-    sampler = std::make_shared<DescartesRobotSampler<FloatType>>(mi.working_frame,
-                                                                 cartesian_waypoint,
-                                                                 target_pose_sampler,
-                                                                 prob.manip,
-                                                                 ci,
-                                                                 mi.tcp_frame,
-                                                                 tcp_offset,
-                                                                 allow_collision,
-                                                                 vertex_evaluator(prob),
-                                                                 use_redundant_joint_solutions);
-  }
-  prob.samplers.push_back(std::move(sampler));
-
-  if (index != 0)
-  {
-    // Add edge Evaluator
-    if (edge_evaluator == nullptr)
-    {
-      if (enable_edge_collision)
-      {
-        auto compound_evaluator = std::make_shared<descartes_light::CompoundEdgeEvaluator<FloatType>>();
-        compound_evaluator->evaluators.push_back(
-            std::make_shared<descartes_light::EuclideanDistanceEdgeEvaluator<FloatType>>());
-        compound_evaluator->evaluators.push_back(std::make_shared<DescartesCollisionEdgeEvaluator<FloatType>>(
-            *prob.env, prob.manip, edge_collision_check_config, allow_collision, debug));
-        prob.edge_evaluators.push_back(compound_evaluator);
-      }
-      else
-      {
-        prob.edge_evaluators.push_back(std::make_shared<descartes_light::EuclideanDistanceEdgeEvaluator<FloatType>>());
-      }
-    }
-    else
-    {
-      if (enable_edge_collision)
-      {
-        auto compound_evaluator = std::make_shared<descartes_light::CompoundEdgeEvaluator<FloatType>>();
-        compound_evaluator->evaluators.push_back(edge_evaluator(prob));
-        compound_evaluator->evaluators.push_back(std::make_shared<DescartesCollisionEdgeEvaluator<FloatType>>(
-            *prob.env, prob.manip, edge_collision_check_config, allow_collision, debug));
-        prob.edge_evaluators.push_back(compound_evaluator);
-      }
-      else
-      {
-        prob.edge_evaluators.push_back(edge_evaluator(prob));
-      }
-    }
-  }
-
-  // Add state evaluator
-  if (state_evaluator != nullptr)
-    prob.state_evaluators.push_back(state_evaluator(prob));
-  else
-    prob.state_evaluators.push_back(std::make_shared<const descartes_light::StateEvaluator<FloatType>>());
-
-  prob.num_threads = num_threads;
+    ci = std::make_shared<DescartesCollision>(*env, manip, vertex_collision_check_config, debug);
+
+  auto ve = createVertexEvaluator(move_instruction, manip, env);
+  auto pose_sampler = createPoseSampler(move_instruction, manip, env);
+  return std::make_unique<DescartesRobotSampler<FloatType>>(
+      manip_info.working_frame,
+      move_instruction.getWaypoint().as<CartesianWaypointPoly>().getTransform(),
+      pose_sampler,
+      manip,
+      ci,
+      manip_info.tcp_frame,
+      tcp_offset,
+      allow_collision,
+      std::move(ve),
+      use_redundant_joint_solutions);
 }
 
 template <typename FloatType>
-void DescartesDefaultPlanProfile<FloatType>::apply(DescartesProblem<FloatType>& prob,
-                                                   const Eigen::VectorXd& joint_waypoint,
-                                                   const InstructionPoly& /*parent_instruction*/,
-                                                   const tesseract_common::ManipulatorInfo& /*manip_info*/,
-                                                   int index) const
+std::unique_ptr<descartes_light::EdgeEvaluator<FloatType>> DescartesDefaultPlanProfile<FloatType>::createEdgeEvaluator(
+    const MoveInstructionPoly& move_instruction,
+    const tesseract_common::ManipulatorInfo& manip_info,
+    const std::shared_ptr<const tesseract_environment::Environment>& env) const
 {
-  auto state = std::make_shared<descartes_light::State<FloatType>>(joint_waypoint.cast<FloatType>());
-  auto sampler = std::make_shared<descartes_light::FixedJointWaypointSampler<FloatType>>(state);
-  prob.samplers.push_back(std::move(sampler));
+  auto manip = DescartesPlanProfile<FloatType>::createKinematicGroup(manip_info, *env);
+  if (move_instruction.getWaypoint().isCartesianWaypoint())
+  {
+    if (!enable_edge_collision)
+      return std::make_unique<descartes_light::EuclideanDistanceEdgeEvaluator<FloatType>>();
 
-  std::vector<std::string> joint_names = prob.manip->getJointNames();
+    auto compound_evaluator = std::make_unique<descartes_light::CompoundEdgeEvaluator<FloatType>>();
+    compound_evaluator->evaluators.push_back(
+        std::make_shared<descartes_light::EuclideanDistanceEdgeEvaluator<FloatType>>());
+    compound_evaluator->evaluators.push_back(std::make_shared<DescartesCollisionEdgeEvaluator<FloatType>>(
+        *env, manip, edge_collision_check_config, allow_collision, debug));
 
-  if (index != 0)
-  {
-    // Add edge Evaluator
-    if (edge_evaluator == nullptr)
-    {
-      if (enable_edge_collision)
-      {
-        auto compound_evaluator = std::make_shared<descartes_light::CompoundEdgeEvaluator<FloatType>>();
-        compound_evaluator->evaluators.push_back(
-            std::make_shared<descartes_light::EuclideanDistanceEdgeEvaluator<FloatType>>());
-        compound_evaluator->evaluators.push_back(std::make_shared<DescartesCollisionEdgeEvaluator<FloatType>>(
-            *prob.env, prob.manip, edge_collision_check_config, allow_collision, debug));
-        prob.edge_evaluators.push_back(compound_evaluator);
-      }
-      else
-      {
-        prob.edge_evaluators.push_back(std::make_shared<descartes_light::EuclideanDistanceEdgeEvaluator<FloatType>>());
-      }
-    }
-    else
-    {
-      prob.edge_evaluators.push_back(edge_evaluator(prob));
-    }
+    return compound_evaluator;
   }
 
-  if (state_evaluator != nullptr)
-    prob.state_evaluators.push_back(state_evaluator(prob));
-  else
-    prob.state_evaluators.push_back(std::make_shared<const descartes_light::StateEvaluator<FloatType>>());
+  if (!enable_edge_collision)
+    return std::make_unique<descartes_light::EuclideanDistanceEdgeEvaluator<FloatType>>();
 
-  prob.num_threads = num_threads;
+  auto compound_evaluator = std::make_unique<descartes_light::CompoundEdgeEvaluator<FloatType>>();
+  compound_evaluator->evaluators.push_back(
+      std::make_shared<descartes_light::EuclideanDistanceEdgeEvaluator<FloatType>>());
+  compound_evaluator->evaluators.push_back(std::make_shared<DescartesCollisionEdgeEvaluator<FloatType>>(
+      *env, manip, edge_collision_check_config, allow_collision, debug));
+
+  return compound_evaluator;
 }
 
 template <typename FloatType>
-tinyxml2::XMLElement* DescartesDefaultPlanProfile<FloatType>::toXML(tinyxml2::XMLDocument& doc) const
+std::unique_ptr<descartes_light::StateEvaluator<FloatType>>
+DescartesDefaultPlanProfile<FloatType>::createStateEvaluator(
+    const MoveInstructionPoly& /*move_instruction*/,
+    const tesseract_common::ManipulatorInfo& /*manip_info*/,
+    const std::shared_ptr<const tesseract_environment::Environment>& /*env*/) const
 {
-  tinyxml2::XMLElement* xml_planner = doc.NewElement("Planner");
-  xml_planner->SetAttribute("type", std::to_string(3).c_str());
-
-  tinyxml2::XMLElement* xml_descartes = doc.NewElement("DescartesPlanProfile");
-
-  tinyxml2::XMLElement* vertex_collisions = doc.NewElement("VertexCollisions");
-  tinyxml2::XMLElement* vertex_collisions_enabled = doc.NewElement("Enabled");
-  vertex_collisions_enabled->SetText(enable_collision);
-  vertex_collisions->InsertEndChild(vertex_collisions_enabled);
-
-  //  tinyxml2::XMLElement* vertex_collisions_safety_margin = doc.NewElement("CollisionSafetyMargin");
-  //  vertex_collisions_safety_margin->SetText(collision_safety_margin);
-  //  vertex_collisions->InsertEndChild(vertex_collisions_safety_margin);
-
-  xml_descartes->InsertEndChild(vertex_collisions);
-
-  tinyxml2::XMLElement* edge_collisions = doc.NewElement("EdgeCollisions");
-  tinyxml2::XMLElement* edge_collisions_enabled = doc.NewElement("Enabled");
-  edge_collisions_enabled->SetText(enable_edge_collision);
-  edge_collisions->InsertEndChild(edge_collisions_enabled);
-
-  /** @todo Update XML */
-  //  tinyxml2::XMLElement* edge_collisions_safety_margin = doc.NewElement("CollisionSafetyMargin");
-  //  edge_collisions_safety_margin->SetText(edge_collision_saftey_margin);
-  //  edge_collisions->InsertEndChild(edge_collisions_safety_margin);
-
-  //  tinyxml2::XMLElement* edge_collisions_long_valid_seg_len = doc.NewElement("LongestValidSegmentLength");
-  //  edge_collisions_long_valid_seg_len->SetText(edge_longest_valid_segment_length);
-  //  edge_collisions->InsertEndChild(edge_collisions_long_valid_seg_len);
-
-  xml_descartes->InsertEndChild(edge_collisions);
-
-  tinyxml2::XMLElement* number_threads = doc.NewElement("NumberThreads");
-  number_threads->SetText(num_threads);
-  xml_descartes->InsertEndChild(number_threads);
-
-  tinyxml2::XMLElement* allow_collision_element = doc.NewElement("AllowCollisions");
-  allow_collision_element->SetText(allow_collision);
-  xml_descartes->InsertEndChild(allow_collision_element);
-
-  tinyxml2::XMLElement* debug_element = doc.NewElement("Debug");
-  debug_element->SetText(debug);
-  xml_descartes->InsertEndChild(debug_element);
-
-  xml_planner->InsertEndChild(xml_descartes);
-
-  // TODO: Add Edge Evaluator and IsValidFn?
-
-  return xml_planner;
+  return std::make_unique<descartes_light::StateEvaluator<FloatType>>();
 }
 
 }  // namespace tesseract_planning
diff --git a/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/serialize.h b/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/impl/profile/descartes_default_solver_profile.hpp
similarity index 51%
rename from tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/serialize.h
rename to tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/impl/profile/descartes_default_solver_profile.hpp
index 44e485ed44..d7ec1d2c69 100644
--- a/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/serialize.h
+++ b/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/impl/profile/descartes_default_solver_profile.hpp
@@ -1,9 +1,9 @@
 /**
- * @file serialize.h
- * @brief Provide methods for serializing descartes plans to xml
+ * @file descartes_default_solver_profile.hpp
+ * @brief
  *
- * @author Tyler Marr
- * @date August 25, 2020
+ * @author Levi Armstrong
+ * @date June 18, 2020
  * @version TODO
  * @bug No known bugs
  *
@@ -23,29 +23,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef TESSERACT_MOTION_PLANNERS_DESCARTES_SERIALIZE_H
-#define TESSERACT_MOTION_PLANNERS_DESCARTES_SERIALIZE_H
+#ifndef TESSERACT_MOTION_PLANNERS_DESCARTES_IMPL_DESCARTES_DESCARTES_DEFAULT_SOLVER_PROFILE_HPP
+#define TESSERACT_MOTION_PLANNERS_DESCARTES_IMPL_DESCARTES_DESCARTES_DEFAULT_SOLVER_PROFILE_HPP
 
-#include <tesseract_common/macros.h>
-TESSERACT_COMMON_IGNORE_WARNINGS_PUSH
-#include <string>
-#include <memory>
-TESSERACT_COMMON_IGNORE_WARNINGS_POP
-
-#include <tesseract_motion_planners/descartes/profile/descartes_profile.h>
-
-namespace tinyxml2
-{
-class XMLElement;  // NOLINT
-class XMLDocument;
-}  // namespace tinyxml2
+#include <tesseract_motion_planners/descartes/profile/descartes_default_solver_profile.h>
 
 namespace tesseract_planning
 {
-std::shared_ptr<tinyxml2::XMLDocument> toXMLDocument(const DescartesPlanProfile<double>& plan_profile);
-
-bool toXMLFile(const DescartesPlanProfile<double>& plan_profile, const std::string& file_path);
+template <typename FloatType>
+DescartesSolverConfig
+DescartesDefaultSolverProfile<FloatType>::createSolverConfig(const CompositeInstruction& /*composite_instruction*/,
+                                                             const tesseract_environment::Environment& /*env*/) const
+{
+  return config;
+}
 
-std::string toXMLString(const DescartesPlanProfile<double>& plan_profile);
 }  // namespace tesseract_planning
-#endif  // TESSERACT_MOTION_PLANNERS_DESCARTES_SERIALIZE_H
+
+#endif  // TESSERACT_MOTION_PLANNERS_DESCARTES_IMPL_DESCARTES_DESCARTES_DEFAULT_SOLVER_PROFILE_HPP
diff --git a/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/impl/profile/descartes_profile.hpp b/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/impl/profile/descartes_profile.hpp
new file mode 100644
index 0000000000..c76f932f00
--- /dev/null
+++ b/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/impl/profile/descartes_profile.hpp
@@ -0,0 +1,55 @@
+/**
+ * @file descartes_profile.h
+ * @brief
+ *
+ * @author Levi Armstrong
+ * @date June 18, 2020
+ * @version TODO
+ * @bug No known bugs
+ *
+ * @copyright Copyright (c) 2020, Southwest Research Institute
+ *
+ * @par License
+ * Software License Agreement (Apache License)
+ * @par
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * @par
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef TESSERACT_MOTION_PLANNERS_DESCARTES_IMPL_DESCARTES_PROFILE_HPP
+#define TESSERACT_MOTION_PLANNERS_DESCARTES_IMPL_DESCARTES_PROFILE_HPP
+#include <tesseract_motion_planners/descartes/profile/descartes_profile.h>
+#include <tesseract_common/manipulator_info.h>
+#include <tesseract_environment/environment.h>
+#include <tesseract_kinematics/core/kinematic_group.h>
+
+namespace tesseract_planning
+{
+template <typename FloatType>
+std::shared_ptr<const tesseract_kinematics::KinematicGroup>
+DescartesPlanProfile<FloatType>::createKinematicGroup(const tesseract_common::ManipulatorInfo& manip_info,
+                                                      const tesseract_environment::Environment& env) const
+{
+  // Get Manipulator Information
+  try
+  {
+    if (manip_info.manipulator_ik_solver.empty())
+      return env.getKinematicGroup(manip_info.manipulator);
+
+    return env.getKinematicGroup(manip_info.manipulator, manip_info.manipulator_ik_solver);
+  }
+  catch (...)
+  {
+    throw std::runtime_error("Descartes problem generator failed to create kinematic group!");
+  }
+}
+
+}  // namespace tesseract_planning
+#endif  // TESSERACT_MOTION_PLANNERS_DESCARTES_IMPL_DESCARTES_PROFILE_HPP
diff --git a/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/profile/descartes_default_plan_profile.h b/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/profile/descartes_default_plan_profile.h
index 1bdde8ee7d..cd4de3db0b 100644
--- a/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/profile/descartes_default_plan_profile.h
+++ b/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/profile/descartes_default_plan_profile.h
@@ -47,15 +47,10 @@ class DescartesDefaultPlanProfile : public DescartesPlanProfile<FloatType>
   using ConstPtr = std::shared_ptr<const DescartesDefaultPlanProfile<FloatType>>;
 
   DescartesDefaultPlanProfile() = default;
-  DescartesDefaultPlanProfile(const tinyxml2::XMLElement& xml_element);
 
-  PoseSamplerFn target_pose_sampler = sampleFixed;
-
-  DescartesEdgeEvaluatorAllocatorFn<FloatType> edge_evaluator{ nullptr };
-  DescartesStateEvaluatorAllocatorFn<FloatType> state_evaluator{ nullptr };
-
-  // If not provided it adds a joint limit is valid function
-  DescartesVertexEvaluatorAllocatorFn<FloatType> vertex_evaluator{ nullptr };
+  bool target_pose_fixed{ true };
+  Eigen::Vector3d target_pose_sample_axis{ 0, 0, 1 };
+  double target_pose_sample_resolution{ M_PI_2 };
 
   /**
    * @brief Flag to indicate that collisions should not cause failures during state/edge evaluation
@@ -79,30 +74,37 @@ class DescartesDefaultPlanProfile : public DescartesPlanProfile<FloatType>
    */
   bool use_redundant_joint_solutions{ false };
 
-  /** @brief Number of threads to use during planning */
-  int num_threads{ 1 };
-
   /** @brief Flag to produce debug information during planning */
   bool debug{ false };
 
-  void apply(DescartesProblem<FloatType>& prob,
-             const Eigen::Isometry3d& cartesian_waypoint,
-             const InstructionPoly& parent_instruction,
-             const tesseract_common::ManipulatorInfo& manip_info,
-             int index) const override;
+  std::unique_ptr<descartes_light::WaypointSampler<FloatType>>
+  createWaypointSampler(const MoveInstructionPoly& move_instruction,
+                        const tesseract_common::ManipulatorInfo& manip_info,
+                        const std::shared_ptr<const tesseract_environment::Environment>& env) const override;
 
-  void apply(DescartesProblem<FloatType>& prob,
-             const Eigen::VectorXd& joint_waypoint,
-             const InstructionPoly& parent_instruction,
-             const tesseract_common::ManipulatorInfo& manip_info,
-             int index) const override;
+  std::unique_ptr<descartes_light::EdgeEvaluator<FloatType>>
+  createEdgeEvaluator(const MoveInstructionPoly& move_instruction,
+                      const tesseract_common::ManipulatorInfo& manip_info,
+                      const std::shared_ptr<const tesseract_environment::Environment>& env) const override;
 
-  tinyxml2::XMLElement* toXML(tinyxml2::XMLDocument& doc) const override;
+  std::unique_ptr<descartes_light::StateEvaluator<FloatType>>
+  createStateEvaluator(const MoveInstructionPoly& move_instruction,
+                       const tesseract_common::ManipulatorInfo& manip_info,
+                       const std::shared_ptr<const tesseract_environment::Environment>& env) const override;
 
 protected:
   friend class boost::serialization::access;
   template <class Archive>
   void serialize(Archive&, const unsigned int);  // NOLINT
+
+  virtual std::unique_ptr<DescartesVertexEvaluator>
+  createVertexEvaluator(const MoveInstructionPoly& move_instruction,
+                        const std::shared_ptr<const tesseract_kinematics::KinematicGroup>& manip,
+                        const std::shared_ptr<const tesseract_environment::Environment>& env) const;
+
+  virtual PoseSamplerFn createPoseSampler(const MoveInstructionPoly& move_instruction,
+                                          const std::shared_ptr<const tesseract_kinematics::KinematicGroup>& manip,
+                                          const std::shared_ptr<const tesseract_environment::Environment>& env) const;
 };
 
 using DescartesDefaultPlanProfileF = DescartesDefaultPlanProfile<float>;
diff --git a/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/profile/descartes_default_solver_profile.h b/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/profile/descartes_default_solver_profile.h
new file mode 100644
index 0000000000..8dc1318ffd
--- /dev/null
+++ b/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/profile/descartes_default_solver_profile.h
@@ -0,0 +1,60 @@
+/**
+ * @file descartes_default_solver_profile.h
+ * @brief
+ *
+ * @author Levi Armstrong
+ * @date June 18, 2020
+ * @version TODO
+ * @bug No known bugs
+ *
+ * @copyright Copyright (c) 2020, Southwest Research Institute
+ *
+ * @par License
+ * Software License Agreement (Apache License)
+ * @par
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * @par
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef TESSERACT_MOTION_PLANNERS_DESCARTES_DESCARTES_DEFAULT_SOLVER_PROFILE_H
+#define TESSERACT_MOTION_PLANNERS_DESCARTES_DESCARTES_DEFAULT_SOLVER_PROFILE_H
+
+#include <tesseract_motion_planners/descartes/profile/descartes_profile.h>
+
+namespace tesseract_planning
+{
+template <typename FloatType>
+class DescartesDefaultSolverProfile : public DescartesSolverProfile<FloatType>
+{
+public:
+  using Ptr = std::shared_ptr<DescartesDefaultSolverProfile<FloatType>>;
+  using ConstPtr = std::shared_ptr<const DescartesDefaultSolverProfile<FloatType>>;
+
+  DescartesDefaultSolverProfile() = default;
+
+  DescartesSolverConfig config;
+
+  DescartesSolverConfig createSolverConfig(const CompositeInstruction& composite_instruction,
+                                           const tesseract_environment::Environment& env) const override;
+
+protected:
+  friend class boost::serialization::access;
+  template <class Archive>
+  void serialize(Archive&, const unsigned int);  // NOLINT
+};
+
+using DescartesDefaultSolverProfileF = DescartesDefaultSolverProfile<float>;
+using DescartesDefaultSolverProfileD = DescartesDefaultSolverProfile<double>;
+}  // namespace tesseract_planning
+
+BOOST_CLASS_EXPORT_KEY(tesseract_planning::DescartesDefaultSolverProfile<float>)
+BOOST_CLASS_EXPORT_KEY(tesseract_planning::DescartesDefaultSolverProfile<double>)
+
+#endif  // TESSERACT_MOTION_PLANNERS_DESCARTES_DESCARTES_DEFAULT_SOLVER_PROFILE_H
diff --git a/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/profile/descartes_profile.h b/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/profile/descartes_profile.h
index 8f90e755ff..7f7515df5a 100644
--- a/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/profile/descartes_profile.h
+++ b/tesseract_motion_planners/descartes/include/tesseract_motion_planners/descartes/profile/descartes_profile.h
@@ -35,17 +35,41 @@ TESSERACT_COMMON_IGNORE_WARNINGS_POP
 
 #include <tesseract_common/fwd.h>
 #include <tesseract_command_language/fwd.h>
-#include <tesseract_command_language/profile.h>
-#include <tesseract_motion_planners/descartes/descartes_problem.h>
+#include <tesseract_kinematics/core/fwd.h>
+#include <tesseract_environment/fwd.h>
 
-namespace tinyxml2
-{
-class XMLElement;  // NOLINT
-class XMLDocument;
-}  // namespace tinyxml2
+#include <tesseract_command_language/profile.h>
+#include <tesseract_motion_planners/descartes/descartes_solver_config.h>
+#include <descartes_light/core/waypoint_sampler.h>
+#include <descartes_light/core/edge_evaluator.h>
+#include <descartes_light/core/state_evaluator.h>
 
 namespace tesseract_planning
 {
+template <typename FloatType>
+class DescartesSolverProfile : public Profile
+{
+public:
+  using Ptr = std::shared_ptr<DescartesSolverProfile<FloatType>>;
+  using ConstPtr = std::shared_ptr<const DescartesSolverProfile<FloatType>>;
+
+  DescartesSolverProfile() : Profile(DescartesSolverProfile<FloatType>::getStaticKey()) {}
+
+  /**
+   * @brief A utility function for getting profile ID
+   * @return The profile ID used when storing in profile dictionary
+   */
+  static std::size_t getStaticKey() { return std::type_index(typeid(DescartesSolverProfile<FloatType>)).hash_code(); }
+
+  virtual DescartesSolverConfig createSolverConfig(const CompositeInstruction& composite_instruction,
+                                                   const tesseract_environment::Environment& env) const = 0;
+
+protected:
+  friend class boost::serialization::access;
+  template <class Archive>
+  void serialize(Archive& ar, const unsigned int);  // NOLINT
+};
+
 template <typename FloatType>
 class DescartesPlanProfile : public Profile
 {
@@ -61,19 +85,24 @@ class DescartesPlanProfile : public Profile
    */
   static std::size_t getStaticKey() { return std::type_index(typeid(DescartesPlanProfile<FloatType>)).hash_code(); }
 
-  virtual void apply(DescartesProblem<FloatType>& prob,
-                     const Eigen::Isometry3d& cartesian_waypoint,
-                     const InstructionPoly& parent_instruction,
-                     const tesseract_common::ManipulatorInfo& manip_info,
-                     int index) const = 0;
+  std::shared_ptr<const tesseract_kinematics::KinematicGroup>
+  createKinematicGroup(const tesseract_common::ManipulatorInfo& manip_info,
+                       const tesseract_environment::Environment& env) const;
+
+  virtual std::unique_ptr<descartes_light::WaypointSampler<FloatType>>
+  createWaypointSampler(const MoveInstructionPoly& move_instruction,
+                        const tesseract_common::ManipulatorInfo& manip_info,
+                        const std::shared_ptr<const tesseract_environment::Environment>& env) const = 0;
 
-  virtual void apply(DescartesProblem<FloatType>& prob,
-                     const Eigen::VectorXd& joint_waypoint,
-                     const InstructionPoly& parent_instruction,
-                     const tesseract_common::ManipulatorInfo& manip_info,
-                     int index) const = 0;
+  virtual std::unique_ptr<descartes_light::EdgeEvaluator<FloatType>>
+  createEdgeEvaluator(const MoveInstructionPoly& move_instruction,
+                      const tesseract_common::ManipulatorInfo& manip_info,
+                      const std::shared_ptr<const tesseract_environment::Environment>& env) const = 0;
 
-  virtual tinyxml2::XMLElement* toXML(tinyxml2::XMLDocument& doc) const = 0;
+  virtual std::unique_ptr<descartes_light::StateEvaluator<FloatType>>
+  createStateEvaluator(const MoveInstructionPoly& move_instruction,
+                       const tesseract_common::ManipulatorInfo& manip_info,
+                       const std::shared_ptr<const tesseract_environment::Environment>& env) const = 0;
 
 protected:
   friend class boost::serialization::access;
@@ -81,7 +110,6 @@ class DescartesPlanProfile : public Profile
   void serialize(Archive& ar, const unsigned int);  // NOLINT
 };
 
-/** @todo Currently descartes does not have support of composite profile everything is handled by the plan profile */
 }  // namespace tesseract_planning
 
 #endif  // TESSERACT_MOTION_PLANNERS_DESCARTES_DESCARTES_PROFILE_H
diff --git a/tesseract_motion_planners/descartes/src/descartes_solver_config.cpp b/tesseract_motion_planners/descartes/src/descartes_solver_config.cpp
new file mode 100644
index 0000000000..7cc0410134
--- /dev/null
+++ b/tesseract_motion_planners/descartes/src/descartes_solver_config.cpp
@@ -0,0 +1,42 @@
+/**
+ * @file descartes_solver_config.cpp
+ * @brief Tesseract Descartes Solver Config
+ *
+ * @author Levi Armstrong
+ * @date June 25, 2020
+ * @version TODO
+ * @bug No known bugs
+ *
+ * @copyright Copyright (c) 2020, Southwest Research Institute
+ *
+ * @par License
+ * Software License Agreement (Apache License)
+ * @par
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * @par
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <tesseract_motion_planners/descartes/descartes_solver_config.h>
+#include <boost/serialization/nvp.hpp>
+
+namespace tesseract_planning
+{
+template <class Archive>
+void DescartesSolverConfig::serialize(Archive& ar, const unsigned int /*version*/)
+{
+  ar& BOOST_SERIALIZATION_NVP(num_threads);
+}
+
+}  // namespace tesseract_planning
+
+#include <tesseract_common/serialization.h>
+TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::DescartesSolverConfig)
+BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::DescartesSolverConfig)
diff --git a/tesseract_motion_planners/descartes/src/deserialize.cpp b/tesseract_motion_planners/descartes/src/deserialize.cpp
deleted file mode 100644
index 0214f2f3ca..0000000000
--- a/tesseract_motion_planners/descartes/src/deserialize.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/**
- * @file deserialize.cpp
- * @brief Provide methods for deserialize instructions to xml and deserialization
- *
- * @author Tyler Marr
- * @date August 21, 2020
- * @version TODO
- * @bug No known bugs
- *
- * @copyright Copyright (c) 2020, Southwest Research Institute
- *
- * @par License
- * Software License Agreement (Apache License)
- * @par
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * @par
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <tesseract_common/macros.h>
-TESSERACT_COMMON_IGNORE_WARNINGS_PUSH
-#include <string>
-#include <fstream>
-#include <tinyxml2.h>
-#include <console_bridge/console.h>
-#include <boost/algorithm/string/classification.hpp>
-#include <boost/algorithm/string/split.hpp>
-TESSERACT_COMMON_IGNORE_WARNINGS_POP
-
-#include <tesseract_motion_planners/descartes/deserialize.h>
-#include <tesseract_common/utils.h>
-
-namespace tesseract_planning
-{
-DescartesDefaultPlanProfile<double> descartesPlanParser(const tinyxml2::XMLElement& xml_element)
-{
-  const tinyxml2::XMLElement* descartes_plan_element = xml_element.FirstChildElement("DescartesPlanProfile");
-  return { *descartes_plan_element };
-}
-
-DescartesDefaultPlanProfile<double> descartesPlanFromXMLElement(const tinyxml2::XMLElement* profile_xml)
-{
-  std::array<int, 3> version{ 0, 0, 0 };
-  std::string version_string;
-  int status = tesseract_common::QueryStringAttribute(profile_xml, "version", version_string);
-  if (status != tinyxml2::XML_NO_ATTRIBUTE && status != tinyxml2::XML_SUCCESS)
-    throw std::runtime_error("fromXML: Error parsing robot attribute 'version'");
-
-  if (status != tinyxml2::XML_NO_ATTRIBUTE)
-  {
-    std::vector<std::string> tokens;
-    boost::split(tokens, version_string, boost::is_any_of("."), boost::token_compress_on);
-    if (tokens.size() < 2 || tokens.size() > 3 || !tesseract_common::isNumeric(tokens))
-      throw std::runtime_error("fromXML: Error parsing robot attribute 'version'");
-
-    tesseract_common::toNumeric<int>(tokens[0], version[0]);
-    tesseract_common::toNumeric<int>(tokens[1], version[1]);
-    if (tokens.size() == 3)
-      tesseract_common::toNumeric<int>(tokens[2], version[2]);
-    else
-      version[2] = 0;
-  }
-  else
-  {
-    CONSOLE_BRIDGE_logWarn("No version number was provided so latest parser will be used.");
-  }
-
-  const tinyxml2::XMLElement* planner_xml = profile_xml->FirstChildElement("Planner");
-  if (planner_xml == nullptr)
-    throw std::runtime_error("fromXML: Could not find the 'Planner' element in the xml file.");
-
-  int type{ 0 };
-  status = planner_xml->QueryIntAttribute("type", &type);
-  if (status != tinyxml2::XML_SUCCESS)
-    throw std::runtime_error("fromXML: Failed to parse instruction type attribute.");
-
-  return descartesPlanParser(*planner_xml);
-}
-
-DescartesDefaultPlanProfile<double> descartesPlanFromXMLDocument(const tinyxml2::XMLDocument& xml_doc)
-{
-  const tinyxml2::XMLElement* planner_xml = xml_doc.FirstChildElement("Profile");
-  if (planner_xml == nullptr)
-    throw std::runtime_error("Could not find the 'Profile' element in the xml file");
-
-  return descartesPlanFromXMLElement(planner_xml);
-}
-
-DescartesDefaultPlanProfile<double> descartesPlanFromXMLString(const std::string& xml_string)
-{
-  tinyxml2::XMLDocument xml_doc;
-  int status = xml_doc.Parse(xml_string.c_str());
-  if (status != tinyxml2::XMLError::XML_SUCCESS)
-    throw std::runtime_error("Could not parse the Planner Profile XML File.");
-
-  return descartesPlanFromXMLDocument(xml_doc);
-}
-
-DescartesDefaultPlanProfile<double> descartesPlanFromXMLFile(const std::string& file_path)
-{
-  // get the entire file
-  std::string xml_string;
-  std::fstream xml_file(file_path.c_str(), std::fstream::in);
-  if (xml_file.is_open())
-  {
-    while (xml_file.good())
-    {
-      std::string line;
-      std::getline(xml_file, line);
-      xml_string += (line + "\n");
-    }
-    xml_file.close();
-    return descartesPlanFromXMLString(xml_string);
-  }
-
-  throw std::runtime_error("Could not open file " + file_path + "for parsing.");
-}
-
-}  // namespace tesseract_planning
diff --git a/tesseract_motion_planners/descartes/src/profile/descartes_default_plan_profile.cpp b/tesseract_motion_planners/descartes/src/profile/descartes_default_plan_profile.cpp
index 70d073c23b..d346590416 100644
--- a/tesseract_motion_planners/descartes/src/profile/descartes_default_plan_profile.cpp
+++ b/tesseract_motion_planners/descartes/src/profile/descartes_default_plan_profile.cpp
@@ -25,6 +25,7 @@
  */
 #include <tesseract_motion_planners/descartes/impl/profile/descartes_default_plan_profile.hpp>
 #include <tesseract_collision/core/serialization.h>
+#include <tesseract_common/eigen_serialization.h>
 #include <boost/serialization/base_object.hpp>
 #include <boost/serialization/nvp.hpp>
 #include <boost/serialization/shared_ptr.hpp>
@@ -40,18 +41,15 @@ template <class Archive>
 void DescartesDefaultPlanProfile<FloatType>::serialize(Archive& ar, const unsigned int /*version*/)
 {
   ar& BOOST_SERIALIZATION_BASE_OBJECT_NVP(DescartesPlanProfile<FloatType>);
-  /** @todo FIX */
-  // ar& BOOST_SERIALIZATION_NVP(target_pose_sampler);
-  // ar& BOOST_SERIALIZATION_NVP(edge_evaluator);
-  // ar& BOOST_SERIALIZATION_NVP(state_evaluator);
-  // ar& BOOST_SERIALIZATION_NVP(vertex_evaluator);
+  ar& BOOST_SERIALIZATION_NVP(target_pose_fixed);
+  ar& BOOST_SERIALIZATION_NVP(target_pose_sample_axis);
+  ar& BOOST_SERIALIZATION_NVP(target_pose_sample_resolution);
   ar& BOOST_SERIALIZATION_NVP(allow_collision);
   ar& BOOST_SERIALIZATION_NVP(enable_collision);
   ar& BOOST_SERIALIZATION_NVP(vertex_collision_check_config);
   ar& BOOST_SERIALIZATION_NVP(enable_edge_collision);
   ar& BOOST_SERIALIZATION_NVP(edge_collision_check_config);
   ar& BOOST_SERIALIZATION_NVP(use_redundant_joint_solutions);
-  ar& BOOST_SERIALIZATION_NVP(num_threads);
   ar& BOOST_SERIALIZATION_NVP(debug);
 }
 
diff --git a/tesseract_motion_planners/descartes/src/profile/descartes_default_solver_profile.cpp b/tesseract_motion_planners/descartes/src/profile/descartes_default_solver_profile.cpp
new file mode 100644
index 0000000000..635e1ed0ec
--- /dev/null
+++ b/tesseract_motion_planners/descartes/src/profile/descartes_default_solver_profile.cpp
@@ -0,0 +1,50 @@
+/**
+ * @file descartes_default_plan_profile.cpp
+ * @brief
+ *
+ * @author Levi Armstrong
+ * @date June 18, 2020
+ * @version TODO
+ * @bug No known bugs
+ *
+ * @copyright Copyright (c) 2020, Southwest Research Institute
+ *
+ * @par License
+ * Software License Agreement (Apache License)
+ * @par
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * @par
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <tesseract_motion_planners/descartes/impl/profile/descartes_default_solver_profile.hpp>
+#include <boost/serialization/base_object.hpp>
+#include <boost/serialization/nvp.hpp>
+
+namespace tesseract_planning
+{
+// Explicit template instantiation
+template class DescartesDefaultSolverProfile<float>;
+template class DescartesDefaultSolverProfile<double>;
+
+template <typename FloatType>
+template <class Archive>
+void DescartesDefaultSolverProfile<FloatType>::serialize(Archive& ar, const unsigned int /*version*/)
+{
+  ar& BOOST_SERIALIZATION_BASE_OBJECT_NVP(DescartesSolverProfile<FloatType>);
+  ar& BOOST_SERIALIZATION_NVP(config);
+}
+
+}  // namespace tesseract_planning
+
+#include <tesseract_common/serialization.h>
+TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::DescartesDefaultSolverProfile<float>)
+BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::DescartesDefaultSolverProfile<float>)
+TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::DescartesDefaultSolverProfile<double>)
+BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::DescartesDefaultSolverProfile<double>)
diff --git a/tesseract_motion_planners/descartes/src/profile/descartes_profile.cpp b/tesseract_motion_planners/descartes/src/profile/descartes_profile.cpp
index 0eeffa0a12..b3a6e6ff37 100644
--- a/tesseract_motion_planners/descartes/src/profile/descartes_profile.cpp
+++ b/tesseract_motion_planners/descartes/src/profile/descartes_profile.cpp
@@ -29,6 +29,13 @@
 
 namespace tesseract_planning
 {
+template <typename FloatType>
+template <class Archive>
+void DescartesSolverProfile<FloatType>::serialize(Archive& ar, const unsigned int /*version*/)
+{
+  ar& BOOST_SERIALIZATION_BASE_OBJECT_NVP(Profile);
+}
+
 template <typename FloatType>
 template <class Archive>
 void DescartesPlanProfile<FloatType>::serialize(Archive& ar, const unsigned int /*version*/)
@@ -43,3 +50,8 @@ TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::DescartesPlanProfil
 BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::DescartesPlanProfile<float>)
 TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::DescartesPlanProfile<double>)
 BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::DescartesPlanProfile<double>)
+
+TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::DescartesSolverProfile<float>)
+BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::DescartesSolverProfile<float>)
+TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::DescartesSolverProfile<double>)
+BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::DescartesSolverProfile<double>)
diff --git a/tesseract_motion_planners/descartes/src/serialize.cpp b/tesseract_motion_planners/descartes/src/serialize.cpp
deleted file mode 100644
index 38be671f73..0000000000
--- a/tesseract_motion_planners/descartes/src/serialize.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * @file serialize.cpp
- * @brief
- *
- * @author Tyler Marr
- * @date August 25, 2020
- * @version TODO
- * @bug No known bugs
- *
- * @copyright Copyright (c) 2020, Southwest Research Institute
- *
- * @par License
- * Software License Agreement (Apache License)
- * @par
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * @par
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <tesseract_common/macros.h>
-TESSERACT_COMMON_IGNORE_WARNINGS_PUSH
-#include <string>
-#include <tinyxml2.h>
-#include <console_bridge/console.h>
-#include <boost/algorithm/string/classification.hpp>
-#include <boost/algorithm/string/split.hpp>
-TESSERACT_COMMON_IGNORE_WARNINGS_POP
-
-#include <tesseract_motion_planners/descartes/serialize.h>
-
-static const std::array<int, 3> VERSION{ { 1, 0, 0 } };
-static const Eigen::IOFormat eigen_format(Eigen::StreamPrecision, Eigen::DontAlignCols, " ", " ");
-
-namespace tesseract_planning
-{
-std::shared_ptr<tinyxml2::XMLDocument> toXMLDocument(const DescartesPlanProfile<double>& plan_profile)
-{
-  auto doc = std::make_shared<tinyxml2::XMLDocument>();
-  tinyxml2::XMLElement* xml_root = doc->NewElement("Profile");
-  xml_root->SetAttribute("name", "DescartesDefaultProfile");
-  xml_root->SetAttribute(
-      "version",
-      (std::to_string(VERSION[0]) + "." + std::to_string(VERSION[1]) + "." + std::to_string(VERSION[2])).c_str());
-
-  tinyxml2::XMLElement* xml_plan_profile = plan_profile.toXML(*doc);
-  xml_root->InsertEndChild(xml_plan_profile);
-  doc->InsertFirstChild(xml_root);
-
-  return doc;
-}
-
-bool toXMLFile(const DescartesPlanProfile<double>& plan_profile, const std::string& file_path)
-{
-  std::shared_ptr<tinyxml2::XMLDocument> doc = toXMLDocument(plan_profile);
-  tinyxml2::XMLError status = doc->SaveFile(file_path.c_str());
-  if (status != tinyxml2::XMLError::XML_SUCCESS)
-  {
-    CONSOLE_BRIDGE_logError("Failed to save Plan Profile XML File: %s", file_path.c_str());
-    return false;
-  }
-
-  return true;
-}
-
-std::string toXMLString(const DescartesPlanProfile<double>& plan_profile)
-{
-  std::shared_ptr<tinyxml2::XMLDocument> doc = toXMLDocument(plan_profile);
-  tinyxml2::XMLPrinter printer;
-  doc->Print(&printer);
-  return { printer.CStr() };
-}
-
-}  // namespace tesseract_planning
diff --git a/tesseract_motion_planners/descartes/test/descartes_planner_tests.cpp b/tesseract_motion_planners/descartes/test/descartes_planner_tests.cpp
index 9debf0705e..bebff73bf0 100644
--- a/tesseract_motion_planners/descartes/test/descartes_planner_tests.cpp
+++ b/tesseract_motion_planners/descartes/test/descartes_planner_tests.cpp
@@ -47,8 +47,7 @@ TESSERACT_COMMON_IGNORE_WARNINGS_POP
 #include <tesseract_motion_planners/descartes/descartes_motion_planner.h>
 #include <tesseract_motion_planners/descartes/descartes_utils.h>
 #include <tesseract_motion_planners/descartes/profile/descartes_default_plan_profile.h>
-#include <tesseract_motion_planners/descartes/serialize.h>
-#include <tesseract_motion_planners/descartes/deserialize.h>
+#include <tesseract_motion_planners/descartes/profile/descartes_default_solver_profile.h>
 #include <tesseract_motion_planners/simple/interpolation.h>
 #include <tesseract_motion_planners/core/types.h>
 #include <tesseract_motion_planners/core/utils.h>
@@ -89,24 +88,6 @@ class TesseractPlanningDescartesUnit : public ::testing::Test
   }
 };
 
-TEST(TesseractPlanningDescartesSerializeUnit, SerializeDescartesDefaultPlanToXml)  // NOLINT
-{
-  // Write program to file
-  DescartesDefaultPlanProfile<double> plan_profile;
-  plan_profile.enable_edge_collision = true;
-
-  EXPECT_TRUE(toXMLFile(plan_profile, tesseract_common::getTempPath() + "descartes_default_plan_example_input.xml"));
-
-  // Import file
-  DescartesDefaultPlanProfile<double> imported_plan_profile =
-      descartesPlanFromXMLFile(tesseract_common::getTempPath() + "descartes_default_plan_example_input.xml");
-
-  // Re-write file and compare changed from default term
-  EXPECT_TRUE(
-      toXMLFile(imported_plan_profile, tesseract_common::getTempPath() + "descartes_default_plan_example_input2.xml"));
-  EXPECT_TRUE(plan_profile.enable_edge_collision == imported_plan_profile.enable_edge_collision);
-}
-
 TEST_F(TesseractPlanningDescartesUnit, DescartesPlannerFixedPoses)  // NOLINT
 {
   // Specify a start waypoint
@@ -133,15 +114,18 @@ TEST_F(TesseractPlanningDescartesUnit, DescartesPlannerFixedPoses)  // NOLINT
   CompositeInstruction interpolated_program = generateInterpolatedProgram(program, env_, 3.14, 1.0, 3.14, 10);
 
   // Create Profiles
+  auto solver_profile = std::make_shared<DescartesDefaultSolverProfileD>();
+  solver_profile->config.num_threads = 1;
+
   auto plan_profile = std::make_shared<DescartesDefaultPlanProfileD>();
 
   // Profile Dictionary
   auto profiles = std::make_shared<ProfileDictionary>();
   profiles->addProfile(DESCARTES_DEFAULT_NAMESPACE, "TEST_PROFILE", plan_profile);
+  profiles->addProfile(DESCARTES_DEFAULT_NAMESPACE, "TEST_PROFILE", solver_profile);
 
   // Create Planner
   DescartesMotionPlannerD single_descartes_planner(DESCARTES_DEFAULT_NAMESPACE);
-  plan_profile->num_threads = 1;
 
   // Create Planning Request
   PlannerRequest request;
@@ -164,7 +148,7 @@ TEST_F(TesseractPlanningDescartesUnit, DescartesPlannerFixedPoses)  // NOLINT
     }
 
     DescartesMotionPlannerD descartes_planner(DESCARTES_DEFAULT_NAMESPACE);
-    plan_profile->num_threads = 4;
+    solver_profile->config.num_threads = 4;
 
     PlannerResponse planner_response = descartes_planner.solve(request);
 
@@ -236,19 +220,23 @@ TEST_F(TesseractPlanningDescartesUnit, DescartesPlannerAxialSymetric)  // NOLINT
   CompositeInstruction interpolated_program = generateInterpolatedProgram(program, env_, 3.14, 1.0, 3.14, 10);
 
   // Create Profiles
+  auto solver_profile = std::make_shared<DescartesDefaultSolverProfileD>();
+  solver_profile->config.num_threads = 1;
+
   auto plan_profile = std::make_shared<DescartesDefaultPlanProfileD>();
+
   // Make this a tool z-axis free sampler
-  plan_profile->target_pose_sampler = [](const Eigen::Isometry3d& tool_pose) {
-    return tesseract_planning::sampleToolAxis(tool_pose, M_PI_4, Eigen::Vector3d(0, 0, 1));
-  };
+  plan_profile->target_pose_fixed = false;
+  plan_profile->target_pose_sample_axis = Eigen::Vector3d(0, 0, 1);
+  plan_profile->target_pose_sample_resolution = M_PI_4;
 
   // Profile Dictionary
   auto profiles = std::make_shared<ProfileDictionary>();
   profiles->addProfile(DESCARTES_DEFAULT_NAMESPACE, "TEST_PROFILE", plan_profile);
+  profiles->addProfile(DESCARTES_DEFAULT_NAMESPACE, "TEST_PROFILE", solver_profile);
 
   // Create Planner
   DescartesMotionPlannerD single_descartes_planner(DESCARTES_DEFAULT_NAMESPACE);
-  plan_profile->num_threads = 1;
 
   // Create Planning Request
   PlannerRequest request;
@@ -257,7 +245,7 @@ TEST_F(TesseractPlanningDescartesUnit, DescartesPlannerAxialSymetric)  // NOLINT
   request.profiles = profiles;
 
   auto problem = single_descartes_planner.createProblem(request);
-  problem->num_threads = 1;
+  problem->solver_config.num_threads = 1;
   EXPECT_EQ(problem->samplers.size(), 11);
   EXPECT_EQ(problem->edge_evaluators.size(), 10);
 
@@ -269,7 +257,7 @@ TEST_F(TesseractPlanningDescartesUnit, DescartesPlannerAxialSymetric)  // NOLINT
   for (int i = 0; i < 10; ++i)
   {
     DescartesMotionPlannerD descartes_planner(DESCARTES_DEFAULT_NAMESPACE);
-    plan_profile->num_threads = 4;
+    solver_profile->config.num_threads = 4;
 
     PlannerResponse planner_response = descartes_planner.solve(request);
     EXPECT_TRUE(&planner_response);
@@ -330,12 +318,18 @@ TEST_F(TesseractPlanningDescartesUnit, DescartesPlannerCollisionEdgeEvaluator)
   CompositeInstruction interpolated_program = generateInterpolatedProgram(program, env_, 3.14, 1.0, 3.14, 2);
 
   // Create Profiles
+  auto solver_profile = std::make_shared<DescartesDefaultSolverProfileD>();
+  solver_profile->config.num_threads = 1;
+
   auto plan_profile = std::make_shared<DescartesDefaultPlanProfileD>();
+
   // Make this a tool z-axis free sampler
-  plan_profile->target_pose_sampler = [](const Eigen::Isometry3d& tool_pose) {
-    return tesseract_planning::sampleToolAxis(tool_pose, 60 * M_PI * 180.0, Eigen::Vector3d(0, 0, 1));
-  };
-  plan_profile->enable_edge_collision = true;  // Add collision edge evaluator
+  plan_profile->target_pose_fixed = false;
+  plan_profile->target_pose_sample_axis = Eigen::Vector3d(0, 0, 1);
+  plan_profile->target_pose_sample_resolution = 60 * M_PI * 180.0;
+
+  // Add collision edge evaluator
+  plan_profile->enable_edge_collision = true;
 
   // Profile Dictionary
   auto profiles = std::make_shared<ProfileDictionary>();
@@ -349,13 +343,12 @@ TEST_F(TesseractPlanningDescartesUnit, DescartesPlannerCollisionEdgeEvaluator)
 
   // Create Planner
   DescartesMotionPlannerD single_descartes_planner(DESCARTES_DEFAULT_NAMESPACE);
-  plan_profile->num_threads = 1;
 
   // Test Problem size - TODO: Make dedicated unit test for DefaultDescartesProblemGenerator
   auto problem = single_descartes_planner.createProblem(request);
   EXPECT_EQ(problem->samplers.size(), 3);
   EXPECT_EQ(problem->edge_evaluators.size(), 2);
-  EXPECT_EQ(problem->num_threads, 1);
+  EXPECT_EQ(problem->solver_config.num_threads, 1);
 
   PlannerResponse single_planner_response = single_descartes_planner.solve(request);
   EXPECT_TRUE(&single_planner_response);
@@ -365,7 +358,7 @@ TEST_F(TesseractPlanningDescartesUnit, DescartesPlannerCollisionEdgeEvaluator)
   for (int i = 0; i < 10; ++i)
   {
     DescartesMotionPlannerD descartes_planner(DESCARTES_DEFAULT_NAMESPACE);
-    plan_profile->num_threads = 4;
+    solver_profile->config.num_threads = 4;
 
     PlannerResponse planner_response = descartes_planner.solve(request);
     EXPECT_TRUE(&planner_response);