diff --git a/fastlib/branches/fastlib-cmake/mlpack/series_expansion/farfield_expansion.h b/fastlib/branches/fastlib-cmake/mlpack/series_expansion/farfield_expansion.h
index c5841e2651..aa5c5d5d11 100644
--- a/fastlib/branches/fastlib-cmake/mlpack/series_expansion/farfield_expansion.h
+++ b/fastlib/branches/fastlib-cmake/mlpack/series_expansion/farfield_expansion.h
@@ -92,10 +92,20 @@ class FarFieldExpansion {
    */
   const typename TKernelAux::TSeriesExpansionAux *sea_;
 
-  OT_DEF(FarFieldExpansion) {
+  /*OT_DEF(FarFieldExpansion) {
     OT_MY_OBJECT(center_);
     OT_MY_OBJECT(coeffs_);
     OT_MY_OBJECT(order_);
+  }*/
+
+  friend class boost::serialization::access; // Should be removed later
+
+  template<class Archive>
+  void serialize(Archive & ar, const unsigned int version)
+  {
+     ar & center_;
+     ar & coeffs_;
+     ar & order_;
   }
 
  public:
diff --git a/fastlib/branches/fastlib-cmake/mlpack/series_expansion/inverse_pow_dist_kernel_aux.h b/fastlib/branches/fastlib-cmake/mlpack/series_expansion/inverse_pow_dist_kernel_aux.h
index 3de1eea473..15a906e2b4 100644
--- a/fastlib/branches/fastlib-cmake/mlpack/series_expansion/inverse_pow_dist_kernel_aux.h
+++ b/fastlib/branches/fastlib-cmake/mlpack/series_expansion/inverse_pow_dist_kernel_aux.h
@@ -78,6 +78,16 @@ class InversePowDistGradientKernelAux {
     OT_MY_OBJECT(sea_);
   }
 
+  friend class boost::serialization::access; // Should be removed later
+
+  template<class Archive>
+  void serialize(Archive & ar, const unsigned int version)
+  {
+     ar & kernel_;
+     ar & sea_;
+  }
+
+
  public:
 
   void Init(double bandwidth, int max_order, int dim) {
diff --git a/fastlib/branches/fastlib-cmake/mlpack/series_expansion/kernel_aux.h b/fastlib/branches/fastlib-cmake/mlpack/series_expansion/kernel_aux.h
index 6150448b22..8c91ec90ba 100644
--- a/fastlib/branches/fastlib-cmake/mlpack/series_expansion/kernel_aux.h
+++ b/fastlib/branches/fastlib-cmake/mlpack/series_expansion/kernel_aux.h
@@ -79,6 +79,16 @@ class GaussianKernelMultAux {
     OT_MY_OBJECT(sea_);
   }
 
+  friend class boost::serialization::access; // Should be removed later
+
+  template<class Archive>
+  void serialize(Archive & ar, const unsigned int version)
+  {
+    ar & kernel_;
+    ar & sea_;
+  }
+
+
  public:
 
   void Init(double bandwidth, int max_order, int dim) {
diff --git a/fastlib/branches/fastlib-cmake/mlpack/series_expansion/local_expansion.h b/fastlib/branches/fastlib-cmake/mlpack/series_expansion/local_expansion.h
index 97cf3290bb..7c6145934a 100644
--- a/fastlib/branches/fastlib-cmake/mlpack/series_expansion/local_expansion.h
+++ b/fastlib/branches/fastlib-cmake/mlpack/series_expansion/local_expansion.h
@@ -85,6 +85,18 @@ class LocalExpansion {
     OT_MY_OBJECT(order_);
   }
 
+
+  friend class boost::serialization::access; // Should be removed later
+
+  template<class Archive>
+  void serialize(Archive & ar, const unsigned int version)
+  {
+    ar & center_;
+    ar & coeffs_;
+    ar & order_;
+  }
+
+
  public:
   
   // getters and setters
diff --git a/fastlib/branches/fastlib-cmake/mlpack/series_expansion/mult_farfield_expansion.h b/fastlib/branches/fastlib-cmake/mlpack/series_expansion/mult_farfield_expansion.h
index b624620488..39d24e85b8 100644
--- a/fastlib/branches/fastlib-cmake/mlpack/series_expansion/mult_farfield_expansion.h
+++ b/fastlib/branches/fastlib-cmake/mlpack/series_expansion/mult_farfield_expansion.h
@@ -85,6 +85,17 @@ class MultFarFieldExpansion {
     OT_MY_OBJECT(order_);
   }
 
+
+  friend class boost::serialization::access; // Should be removed later
+
+  template<class Archive>
+  void serialize(Archive & ar, const unsigned int version)
+  {
+    ar & center_;
+    ar & coeffs_;
+    ar & order_;
+  }
+
  public:
   
   // getters and setters
diff --git a/fastlib/branches/fastlib-cmake/mlpack/series_expansion/mult_local_expansion.h b/fastlib/branches/fastlib-cmake/mlpack/series_expansion/mult_local_expansion.h
index 87a9415663..2bb31807ce 100644
--- a/fastlib/branches/fastlib-cmake/mlpack/series_expansion/mult_local_expansion.h
+++ b/fastlib/branches/fastlib-cmake/mlpack/series_expansion/mult_local_expansion.h
@@ -84,6 +84,17 @@ class MultLocalExpansion {
     OT_MY_OBJECT(coeffs_);
     OT_MY_OBJECT(order_);
   }
+
+  friend class boost::serialization::access; // Should be removed later
+
+  template<class Archive>
+  void serialize(Archive & ar, const unsigned int version)
+  {
+    ar & center_;
+    ar & coeffs_;
+    ar & order_;
+  }
+
   
  public:
   
diff --git a/fastlib/branches/fastlib-cmake/mlpack/series_expansion/mult_series_expansion_aux.h b/fastlib/branches/fastlib-cmake/mlpack/series_expansion/mult_series_expansion_aux.h
index 9eec132ecf..138570a181 100644
--- a/fastlib/branches/fastlib-cmake/mlpack/series_expansion/mult_series_expansion_aux.h
+++ b/fastlib/branches/fastlib-cmake/mlpack/series_expansion/mult_series_expansion_aux.h
@@ -84,7 +84,7 @@ class MultSeriesExpansionAux {
    */
   ArrayList< ArrayList<int> > traversal_mapping_;
 
-  OT_DEF_BASIC(MultSeriesExpansionAux) {
+/*  OT_DEF_BASIC(MultSeriesExpansionAux) {
     OT_MY_OBJECT(dim_);
     OT_MY_OBJECT(max_order_);
     OT_MY_OBJECT(factorials_);
@@ -98,6 +98,26 @@ class MultSeriesExpansionAux {
     OT_MY_OBJECT(n_choose_k_);
     OT_MY_OBJECT(traversal_mapping_);
   }
+*/
+
+  friend class boost::serialization::access; // Should be removed later
+
+  template<class Archive>
+  void serialize(Archive & ar, const unsigned int version)
+  {
+    ar & dim_;
+    ar & max_order_;
+    ar & factorials_;
+    ar & list_total_num_coeffs_;
+    ar & inv_multiindex_factorials_;
+    ar & neg_inv_multiindex_factorials_;
+    ar & multiindex_combination_;
+    ar & multiindex_mapping_;
+    ar & lower_mapping_index_;
+    ar & upper_mapping_index_;
+    ar & n_choose_k_;
+    ar & traversal_mapping_;
+  }
 
  public:
 
diff --git a/fastlib/branches/fastlib-cmake/mlpack/series_expansion/series_expansion_aux.h b/fastlib/branches/fastlib-cmake/mlpack/series_expansion/series_expansion_aux.h
index bbd36426dd..854edede8c 100644
--- a/fastlib/branches/fastlib-cmake/mlpack/series_expansion/series_expansion_aux.h
+++ b/fastlib/branches/fastlib-cmake/mlpack/series_expansion/series_expansion_aux.h
@@ -77,7 +77,7 @@ class SeriesExpansionAux {
   /** row index is for n, column index is for k */
   Matrix n_choose_k_;
 
-  OT_DEF_BASIC(SeriesExpansionAux) {
+/*  OT_DEF_BASIC(SeriesExpansionAux) {
     OT_MY_OBJECT(dim_);
     OT_MY_OBJECT(max_order_);
     OT_MY_OBJECT(factorials_);
@@ -90,6 +90,26 @@ class SeriesExpansionAux {
     OT_MY_OBJECT(upper_mapping_index_);
     OT_MY_OBJECT(n_choose_k_);
   }
+*/
+
+    friend class boost::serialization::access; // Should be removed later
+
+    template<class Archive>
+    void serialize(Archive & ar, const unsigned int version)
+    {
+       ar & dim_;
+       ar & max_order_;
+       ar & factorials_;
+       ar & list_total_num_coeffs_;
+       ar & inv_multiindex_factorials_;
+       ar & neg_inv_multiindex_factorials_;
+       ar & multiindex_combination_;
+       ar & multiindex_mapping_;
+       ar & lower_mapping_index_;
+       ar & upper_mapping_index_;
+       ar & n_choose_k_;
+    }
+
 
  public: