diff --git a/docs/user_guide/preprocessing/location.ipynb b/docs/user_guide/preprocessing/location.ipynb
index 46ff53ac..8316fca3 100644
--- a/docs/user_guide/preprocessing/location.ipynb
+++ b/docs/user_guide/preprocessing/location.ipynb
@@ -307,7 +307,7 @@
    ],
    "source": [
     "binned_data = niimpy.util.aggregate(data, freq='5min', method_numerical='median')\n",
-    "binned_data = binned_data.reset_index(0).dropna()\n",
+    "binned_data = binned_data.dropna()\n",
     "binned_data.shape"
    ]
   },
@@ -559,25 +559,25 @@
        "      <th></th>\n",
        "      <th>user</th>\n",
        "      <th>n_significant_places</th>\n",
-       "      <th>n_sps</th>\n",
-       "      <th>n_static</th>\n",
-       "      <th>n_moving</th>\n",
-       "      <th>n_rare</th>\n",
-       "      <th>n_home</th>\n",
-       "      <th>max_dist_home</th>\n",
        "      <th>n_transitions</th>\n",
+       "      <th>normalized_entropy</th>\n",
        "      <th>n_top1</th>\n",
+       "      <th>n_top4</th>\n",
+       "      <th>n_rare</th>\n",
+       "      <th>n_top2</th>\n",
+       "      <th>n_moving</th>\n",
+       "      <th>max_dist_home</th>\n",
        "      <th>...</th>\n",
-       "      <th>n_top5</th>\n",
+       "      <th>n_top3</th>\n",
        "      <th>entropy</th>\n",
-       "      <th>normalized_entropy</th>\n",
+       "      <th>n_sps</th>\n",
+       "      <th>log_variance</th>\n",
+       "      <th>variance</th>\n",
        "      <th>dist_total</th>\n",
-       "      <th>n_bins</th>\n",
-       "      <th>speed_average</th>\n",
        "      <th>speed_variance</th>\n",
+       "      <th>speed_average</th>\n",
+       "      <th>n_bins</th>\n",
        "      <th>speed_max</th>\n",
-       "      <th>variance</th>\n",
-       "      <th>log_variance</th>\n",
        "    </tr>\n",
        "  </thead>\n",
        "  <tbody>\n",
@@ -585,169 +585,169 @@
        "      <th>2013-03-31 00:00:00+02:00</th>\n",
        "      <td>gps_u00</td>\n",
        "      <td>6</td>\n",
-       "      <td>5.0</td>\n",
-       "      <td>280.0</td>\n",
-       "      <td>8.0</td>\n",
-       "      <td>3.0</td>\n",
-       "      <td>106.0</td>\n",
-       "      <td>2.074186e+04</td>\n",
        "      <td>48.0</td>\n",
+       "      <td>3.163631</td>\n",
        "      <td>106.0</td>\n",
+       "      <td>20.0</td>\n",
+       "      <td>3.0</td>\n",
+       "      <td>99.0</td>\n",
+       "      <td>8.0</td>\n",
+       "      <td>2.074186e+04</td>\n",
        "      <td>...</td>\n",
-       "      <td>18.0</td>\n",
+       "      <td>34.0</td>\n",
        "      <td>5.091668</td>\n",
-       "      <td>3.163631</td>\n",
+       "      <td>5.0</td>\n",
+       "      <td>-5.761688</td>\n",
+       "      <td>0.003146</td>\n",
        "      <td>4.132581e+05</td>\n",
-       "      <td>288.0</td>\n",
-       "      <td>0.033496</td>\n",
        "      <td>0.044885</td>\n",
+       "      <td>0.033496</td>\n",
+       "      <td>288.0</td>\n",
        "      <td>1.750000</td>\n",
-       "      <td>0.003146</td>\n",
-       "      <td>-5.761688</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>2013-04-30 00:00:00+03:00</th>\n",
        "      <td>gps_u00</td>\n",
        "      <td>10</td>\n",
-       "      <td>10.0</td>\n",
-       "      <td>1966.0</td>\n",
-       "      <td>66.0</td>\n",
-       "      <td>45.0</td>\n",
-       "      <td>1010.0</td>\n",
-       "      <td>2.914790e+05</td>\n",
        "      <td>194.0</td>\n",
+       "      <td>3.163793</td>\n",
        "      <td>1016.0</td>\n",
+       "      <td>45.0</td>\n",
+       "      <td>45.0</td>\n",
+       "      <td>668.0</td>\n",
+       "      <td>66.0</td>\n",
+       "      <td>2.914790e+05</td>\n",
        "      <td>...</td>\n",
-       "      <td>38.0</td>\n",
+       "      <td>135.0</td>\n",
        "      <td>7.284903</td>\n",
-       "      <td>3.163793</td>\n",
+       "      <td>10.0</td>\n",
+       "      <td>-1.439133</td>\n",
+       "      <td>0.237133</td>\n",
        "      <td>2.179693e+06</td>\n",
-       "      <td>2032.0</td>\n",
-       "      <td>0.269932</td>\n",
        "      <td>6.129277</td>\n",
+       "      <td>0.269932</td>\n",
+       "      <td>2032.0</td>\n",
        "      <td>33.250000</td>\n",
-       "      <td>0.237133</td>\n",
-       "      <td>-1.439133</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>2013-05-31 00:00:00+03:00</th>\n",
        "      <td>gps_u00</td>\n",
        "      <td>15</td>\n",
-       "      <td>12.0</td>\n",
-       "      <td>1827.0</td>\n",
-       "      <td>76.0</td>\n",
-       "      <td>86.0</td>\n",
-       "      <td>1028.0</td>\n",
-       "      <td>1.041741e+06</td>\n",
        "      <td>107.0</td>\n",
+       "      <td>2.696752</td>\n",
        "      <td>1030.0</td>\n",
+       "      <td>65.0</td>\n",
+       "      <td>86.0</td>\n",
+       "      <td>501.0</td>\n",
+       "      <td>76.0</td>\n",
+       "      <td>1.041741e+06</td>\n",
        "      <td>...</td>\n",
-       "      <td>46.0</td>\n",
+       "      <td>86.0</td>\n",
        "      <td>6.701177</td>\n",
-       "      <td>2.696752</td>\n",
+       "      <td>12.0</td>\n",
+       "      <td>2.114892</td>\n",
+       "      <td>8.288687</td>\n",
        "      <td>6.986551e+06</td>\n",
-       "      <td>1903.0</td>\n",
-       "      <td>0.351280</td>\n",
        "      <td>7.590639</td>\n",
+       "      <td>0.351280</td>\n",
+       "      <td>1903.0</td>\n",
        "      <td>34.000000</td>\n",
-       "      <td>8.288687</td>\n",
-       "      <td>2.114892</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>2013-06-30 00:00:00+03:00</th>\n",
        "      <td>gps_u00</td>\n",
        "      <td>1</td>\n",
-       "      <td>1.0</td>\n",
-       "      <td>22.0</td>\n",
-       "      <td>2.0</td>\n",
+       "      <td>10.0</td>\n",
+       "      <td>0.000000</td>\n",
        "      <td>15.0</td>\n",
        "      <td>0.0</td>\n",
-       "      <td>2.035837e+04</td>\n",
-       "      <td>10.0</td>\n",
        "      <td>15.0</td>\n",
+       "      <td>7.0</td>\n",
+       "      <td>2.0</td>\n",
+       "      <td>2.035837e+04</td>\n",
        "      <td>...</td>\n",
        "      <td>0.0</td>\n",
        "      <td>0.000000</td>\n",
-       "      <td>0.000000</td>\n",
+       "      <td>1.0</td>\n",
+       "      <td>-4.200287</td>\n",
+       "      <td>0.014991</td>\n",
        "      <td>2.252893e+05</td>\n",
-       "      <td>24.0</td>\n",
-       "      <td>0.044126</td>\n",
        "      <td>0.021490</td>\n",
+       "      <td>0.044126</td>\n",
+       "      <td>24.0</td>\n",
        "      <td>0.559017</td>\n",
-       "      <td>0.014991</td>\n",
-       "      <td>-4.200287</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>2013-03-31 00:00:00+02:00</th>\n",
        "      <td>gps_u01</td>\n",
        "      <td>4</td>\n",
-       "      <td>2.0</td>\n",
-       "      <td>307.0</td>\n",
-       "      <td>18.0</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>260.0</td>\n",
-       "      <td>6.975303e+02</td>\n",
        "      <td>8.0</td>\n",
+       "      <td>4.392317</td>\n",
        "      <td>286.0</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>21.0</td>\n",
+       "      <td>18.0</td>\n",
+       "      <td>6.975303e+02</td>\n",
        "      <td>...</td>\n",
        "      <td>0.0</td>\n",
        "      <td>3.044522</td>\n",
-       "      <td>4.392317</td>\n",
+       "      <td>2.0</td>\n",
+       "      <td>-12.520989</td>\n",
+       "      <td>0.000004</td>\n",
        "      <td>1.328713e+04</td>\n",
-       "      <td>325.0</td>\n",
-       "      <td>0.056290</td>\n",
        "      <td>0.073370</td>\n",
+       "      <td>0.056290</td>\n",
+       "      <td>325.0</td>\n",
        "      <td>2.692582</td>\n",
-       "      <td>0.000004</td>\n",
-       "      <td>-12.520989</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>2013-04-30 00:00:00+03:00</th>\n",
        "      <td>gps_u01</td>\n",
        "      <td>4</td>\n",
+       "      <td>2.0</td>\n",
+       "      <td>0.000000</td>\n",
+       "      <td>1998.0</td>\n",
+       "      <td>0.0</td>\n",
        "      <td>1.0</td>\n",
-       "      <td>1999.0</td>\n",
-       "      <td>71.0</td>\n",
        "      <td>1.0</td>\n",
-       "      <td>1500.0</td>\n",
+       "      <td>71.0</td>\n",
        "      <td>1.156568e+04</td>\n",
-       "      <td>2.0</td>\n",
-       "      <td>1998.0</td>\n",
        "      <td>...</td>\n",
        "      <td>0.0</td>\n",
        "      <td>0.000000</td>\n",
-       "      <td>0.000000</td>\n",
+       "      <td>1.0</td>\n",
+       "      <td>-10.510017</td>\n",
+       "      <td>0.000027</td>\n",
        "      <td>1.238429e+05</td>\n",
-       "      <td>2070.0</td>\n",
-       "      <td>0.066961</td>\n",
        "      <td>0.629393</td>\n",
+       "      <td>0.066961</td>\n",
+       "      <td>2070.0</td>\n",
        "      <td>32.750000</td>\n",
-       "      <td>0.000027</td>\n",
-       "      <td>-10.510017</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>2013-05-31 00:00:00+03:00</th>\n",
        "      <td>gps_u01</td>\n",
        "      <td>2</td>\n",
+       "      <td>2.0</td>\n",
+       "      <td>0.000000</td>\n",
+       "      <td>3078.0</td>\n",
+       "      <td>0.0</td>\n",
        "      <td>1.0</td>\n",
-       "      <td>3079.0</td>\n",
-       "      <td>34.0</td>\n",
        "      <td>1.0</td>\n",
-       "      <td>45.0</td>\n",
+       "      <td>34.0</td>\n",
        "      <td>3.957650e+03</td>\n",
-       "      <td>2.0</td>\n",
-       "      <td>3078.0</td>\n",
        "      <td>...</td>\n",
        "      <td>0.0</td>\n",
        "      <td>0.000000</td>\n",
-       "      <td>0.000000</td>\n",
+       "      <td>1.0</td>\n",
+       "      <td>-11.364454</td>\n",
+       "      <td>0.000012</td>\n",
        "      <td>1.228235e+05</td>\n",
-       "      <td>3113.0</td>\n",
-       "      <td>0.026392</td>\n",
        "      <td>0.261978</td>\n",
+       "      <td>0.026392</td>\n",
+       "      <td>3113.0</td>\n",
        "      <td>20.250000</td>\n",
-       "      <td>0.000012</td>\n",
-       "      <td>-11.364454</td>\n",
        "    </tr>\n",
        "  </tbody>\n",
        "</table>\n",
@@ -755,59 +755,50 @@
        "</div>"
       ],
       "text/plain": [
-       "                              user  n_significant_places  n_sps  n_static  \\\n",
-       "2013-03-31 00:00:00+02:00  gps_u00                     6    5.0     280.0   \n",
-       "2013-04-30 00:00:00+03:00  gps_u00                    10   10.0    1966.0   \n",
-       "2013-05-31 00:00:00+03:00  gps_u00                    15   12.0    1827.0   \n",
-       "2013-06-30 00:00:00+03:00  gps_u00                     1    1.0      22.0   \n",
-       "2013-03-31 00:00:00+02:00  gps_u01                     4    2.0     307.0   \n",
-       "2013-04-30 00:00:00+03:00  gps_u01                     4    1.0    1999.0   \n",
-       "2013-05-31 00:00:00+03:00  gps_u01                     2    1.0    3079.0   \n",
+       "                              user  n_significant_places  n_transitions  \\\n",
+       "2013-03-31 00:00:00+02:00  gps_u00                     6           48.0   \n",
+       "2013-04-30 00:00:00+03:00  gps_u00                    10          194.0   \n",
+       "2013-05-31 00:00:00+03:00  gps_u00                    15          107.0   \n",
+       "2013-06-30 00:00:00+03:00  gps_u00                     1           10.0   \n",
+       "2013-03-31 00:00:00+02:00  gps_u01                     4            8.0   \n",
+       "2013-04-30 00:00:00+03:00  gps_u01                     4            2.0   \n",
+       "2013-05-31 00:00:00+03:00  gps_u01                     2            2.0   \n",
        "\n",
-       "                           n_moving  n_rare  n_home  max_dist_home  \\\n",
-       "2013-03-31 00:00:00+02:00       8.0     3.0   106.0   2.074186e+04   \n",
-       "2013-04-30 00:00:00+03:00      66.0    45.0  1010.0   2.914790e+05   \n",
-       "2013-05-31 00:00:00+03:00      76.0    86.0  1028.0   1.041741e+06   \n",
-       "2013-06-30 00:00:00+03:00       2.0    15.0     0.0   2.035837e+04   \n",
-       "2013-03-31 00:00:00+02:00      18.0     0.0   260.0   6.975303e+02   \n",
-       "2013-04-30 00:00:00+03:00      71.0     1.0  1500.0   1.156568e+04   \n",
-       "2013-05-31 00:00:00+03:00      34.0     1.0    45.0   3.957650e+03   \n",
+       "                           normalized_entropy  n_top1  n_top4  n_rare  n_top2  \\\n",
+       "2013-03-31 00:00:00+02:00            3.163631   106.0    20.0     3.0    99.0   \n",
+       "2013-04-30 00:00:00+03:00            3.163793  1016.0    45.0    45.0   668.0   \n",
+       "2013-05-31 00:00:00+03:00            2.696752  1030.0    65.0    86.0   501.0   \n",
+       "2013-06-30 00:00:00+03:00            0.000000    15.0     0.0    15.0     7.0   \n",
+       "2013-03-31 00:00:00+02:00            4.392317   286.0     0.0     0.0    21.0   \n",
+       "2013-04-30 00:00:00+03:00            0.000000  1998.0     0.0     1.0     1.0   \n",
+       "2013-05-31 00:00:00+03:00            0.000000  3078.0     0.0     1.0     1.0   \n",
        "\n",
-       "                           n_transitions  n_top1  ...  n_top5   entropy  \\\n",
-       "2013-03-31 00:00:00+02:00           48.0   106.0  ...    18.0  5.091668   \n",
-       "2013-04-30 00:00:00+03:00          194.0  1016.0  ...    38.0  7.284903   \n",
-       "2013-05-31 00:00:00+03:00          107.0  1030.0  ...    46.0  6.701177   \n",
-       "2013-06-30 00:00:00+03:00           10.0    15.0  ...     0.0  0.000000   \n",
-       "2013-03-31 00:00:00+02:00            8.0   286.0  ...     0.0  3.044522   \n",
-       "2013-04-30 00:00:00+03:00            2.0  1998.0  ...     0.0  0.000000   \n",
-       "2013-05-31 00:00:00+03:00            2.0  3078.0  ...     0.0  0.000000   \n",
+       "                           n_moving  max_dist_home  ...  n_top3   entropy  \\\n",
+       "2013-03-31 00:00:00+02:00       8.0   2.074186e+04  ...    34.0  5.091668   \n",
+       "2013-04-30 00:00:00+03:00      66.0   2.914790e+05  ...   135.0  7.284903   \n",
+       "2013-05-31 00:00:00+03:00      76.0   1.041741e+06  ...    86.0  6.701177   \n",
+       "2013-06-30 00:00:00+03:00       2.0   2.035837e+04  ...     0.0  0.000000   \n",
+       "2013-03-31 00:00:00+02:00      18.0   6.975303e+02  ...     0.0  3.044522   \n",
+       "2013-04-30 00:00:00+03:00      71.0   1.156568e+04  ...     0.0  0.000000   \n",
+       "2013-05-31 00:00:00+03:00      34.0   3.957650e+03  ...     0.0  0.000000   \n",
        "\n",
-       "                           normalized_entropy    dist_total  n_bins  \\\n",
-       "2013-03-31 00:00:00+02:00            3.163631  4.132581e+05   288.0   \n",
-       "2013-04-30 00:00:00+03:00            3.163793  2.179693e+06  2032.0   \n",
-       "2013-05-31 00:00:00+03:00            2.696752  6.986551e+06  1903.0   \n",
-       "2013-06-30 00:00:00+03:00            0.000000  2.252893e+05    24.0   \n",
-       "2013-03-31 00:00:00+02:00            4.392317  1.328713e+04   325.0   \n",
-       "2013-04-30 00:00:00+03:00            0.000000  1.238429e+05  2070.0   \n",
-       "2013-05-31 00:00:00+03:00            0.000000  1.228235e+05  3113.0   \n",
+       "                           n_sps  log_variance  variance    dist_total  \\\n",
+       "2013-03-31 00:00:00+02:00    5.0     -5.761688  0.003146  4.132581e+05   \n",
+       "2013-04-30 00:00:00+03:00   10.0     -1.439133  0.237133  2.179693e+06   \n",
+       "2013-05-31 00:00:00+03:00   12.0      2.114892  8.288687  6.986551e+06   \n",
+       "2013-06-30 00:00:00+03:00    1.0     -4.200287  0.014991  2.252893e+05   \n",
+       "2013-03-31 00:00:00+02:00    2.0    -12.520989  0.000004  1.328713e+04   \n",
+       "2013-04-30 00:00:00+03:00    1.0    -10.510017  0.000027  1.238429e+05   \n",
+       "2013-05-31 00:00:00+03:00    1.0    -11.364454  0.000012  1.228235e+05   \n",
        "\n",
-       "                           speed_average  speed_variance  speed_max  variance  \\\n",
-       "2013-03-31 00:00:00+02:00       0.033496        0.044885   1.750000  0.003146   \n",
-       "2013-04-30 00:00:00+03:00       0.269932        6.129277  33.250000  0.237133   \n",
-       "2013-05-31 00:00:00+03:00       0.351280        7.590639  34.000000  8.288687   \n",
-       "2013-06-30 00:00:00+03:00       0.044126        0.021490   0.559017  0.014991   \n",
-       "2013-03-31 00:00:00+02:00       0.056290        0.073370   2.692582  0.000004   \n",
-       "2013-04-30 00:00:00+03:00       0.066961        0.629393  32.750000  0.000027   \n",
-       "2013-05-31 00:00:00+03:00       0.026392        0.261978  20.250000  0.000012   \n",
-       "\n",
-       "                           log_variance  \n",
-       "2013-03-31 00:00:00+02:00     -5.761688  \n",
-       "2013-04-30 00:00:00+03:00     -1.439133  \n",
-       "2013-05-31 00:00:00+03:00      2.114892  \n",
-       "2013-06-30 00:00:00+03:00     -4.200287  \n",
-       "2013-03-31 00:00:00+02:00    -12.520989  \n",
-       "2013-04-30 00:00:00+03:00    -10.510017  \n",
-       "2013-05-31 00:00:00+03:00    -11.364454  \n",
+       "                           speed_variance  speed_average  n_bins  speed_max  \n",
+       "2013-03-31 00:00:00+02:00        0.044885       0.033496   288.0   1.750000  \n",
+       "2013-04-30 00:00:00+03:00        6.129277       0.269932  2032.0  33.250000  \n",
+       "2013-05-31 00:00:00+03:00        7.590639       0.351280  1903.0  34.000000  \n",
+       "2013-06-30 00:00:00+03:00        0.021490       0.044126    24.0   0.559017  \n",
+       "2013-03-31 00:00:00+02:00        0.073370       0.056290   325.0   2.692582  \n",
+       "2013-04-30 00:00:00+03:00        0.629393       0.066961  2070.0  32.750000  \n",
+       "2013-05-31 00:00:00+03:00        0.261978       0.026392  3113.0  20.250000  \n",
        "\n",
        "[7 rows x 23 columns]"
       ]
@@ -821,7 +812,8 @@
     "import warnings\n",
     "warnings.filterwarnings('ignore', category=RuntimeWarning)\n",
     "\n",
-    "# extract all the available features\n",
+    "# extract all the availa\n",
+    "# ble features\n",
     "all_features = nilo.extract_features_location(binned_data)\n",
     "all_features"
    ]
@@ -854,115 +846,115 @@
        "    <tr style=\"text-align: right;\">\n",
        "      <th></th>\n",
        "      <th>user</th>\n",
+       "      <th>log_variance</th>\n",
+       "      <th>variance</th>\n",
        "      <th>dist_total</th>\n",
-       "      <th>n_bins</th>\n",
-       "      <th>speed_average</th>\n",
        "      <th>speed_variance</th>\n",
+       "      <th>speed_average</th>\n",
+       "      <th>n_bins</th>\n",
        "      <th>speed_max</th>\n",
-       "      <th>variance</th>\n",
-       "      <th>log_variance</th>\n",
        "    </tr>\n",
        "  </thead>\n",
        "  <tbody>\n",
        "    <tr>\n",
        "      <th>2013-03-31 00:00:00+02:00</th>\n",
        "      <td>gps_u00</td>\n",
+       "      <td>-5.761688</td>\n",
+       "      <td>0.003146</td>\n",
        "      <td>4.132581e+05</td>\n",
-       "      <td>288.0</td>\n",
-       "      <td>0.033496</td>\n",
        "      <td>0.044885</td>\n",
+       "      <td>0.033496</td>\n",
+       "      <td>288.0</td>\n",
        "      <td>1.750000</td>\n",
-       "      <td>0.003146</td>\n",
-       "      <td>-5.761688</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>2013-04-30 00:00:00+03:00</th>\n",
        "      <td>gps_u00</td>\n",
+       "      <td>-1.439133</td>\n",
+       "      <td>0.237133</td>\n",
        "      <td>2.179693e+06</td>\n",
-       "      <td>2032.0</td>\n",
-       "      <td>0.269932</td>\n",
        "      <td>6.129277</td>\n",
+       "      <td>0.269932</td>\n",
+       "      <td>2032.0</td>\n",
        "      <td>33.250000</td>\n",
-       "      <td>0.237133</td>\n",
-       "      <td>-1.439133</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>2013-05-31 00:00:00+03:00</th>\n",
        "      <td>gps_u00</td>\n",
+       "      <td>2.114892</td>\n",
+       "      <td>8.288687</td>\n",
        "      <td>6.986551e+06</td>\n",
-       "      <td>1903.0</td>\n",
-       "      <td>0.351280</td>\n",
        "      <td>7.590639</td>\n",
+       "      <td>0.351280</td>\n",
+       "      <td>1903.0</td>\n",
        "      <td>34.000000</td>\n",
-       "      <td>8.288687</td>\n",
-       "      <td>2.114892</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>2013-06-30 00:00:00+03:00</th>\n",
        "      <td>gps_u00</td>\n",
+       "      <td>-4.200287</td>\n",
+       "      <td>0.014991</td>\n",
        "      <td>2.252893e+05</td>\n",
-       "      <td>24.0</td>\n",
-       "      <td>0.044126</td>\n",
        "      <td>0.021490</td>\n",
+       "      <td>0.044126</td>\n",
+       "      <td>24.0</td>\n",
        "      <td>0.559017</td>\n",
-       "      <td>0.014991</td>\n",
-       "      <td>-4.200287</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>2013-03-31 00:00:00+02:00</th>\n",
        "      <td>gps_u01</td>\n",
+       "      <td>-12.520989</td>\n",
+       "      <td>0.000004</td>\n",
        "      <td>1.328713e+04</td>\n",
-       "      <td>325.0</td>\n",
-       "      <td>0.056290</td>\n",
        "      <td>0.073370</td>\n",
+       "      <td>0.056290</td>\n",
+       "      <td>325.0</td>\n",
        "      <td>2.692582</td>\n",
-       "      <td>0.000004</td>\n",
-       "      <td>-12.520989</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>2013-04-30 00:00:00+03:00</th>\n",
        "      <td>gps_u01</td>\n",
+       "      <td>-10.510017</td>\n",
+       "      <td>0.000027</td>\n",
        "      <td>1.238429e+05</td>\n",
-       "      <td>2070.0</td>\n",
-       "      <td>0.066961</td>\n",
        "      <td>0.629393</td>\n",
+       "      <td>0.066961</td>\n",
+       "      <td>2070.0</td>\n",
        "      <td>32.750000</td>\n",
-       "      <td>0.000027</td>\n",
-       "      <td>-10.510017</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>2013-05-31 00:00:00+03:00</th>\n",
        "      <td>gps_u01</td>\n",
+       "      <td>-11.364454</td>\n",
+       "      <td>0.000012</td>\n",
        "      <td>1.228235e+05</td>\n",
-       "      <td>3113.0</td>\n",
-       "      <td>0.026392</td>\n",
        "      <td>0.261978</td>\n",
+       "      <td>0.026392</td>\n",
+       "      <td>3113.0</td>\n",
        "      <td>20.250000</td>\n",
-       "      <td>0.000012</td>\n",
-       "      <td>-11.364454</td>\n",
        "    </tr>\n",
        "  </tbody>\n",
        "</table>\n",
        "</div>"
       ],
       "text/plain": [
-       "                              user    dist_total  n_bins  speed_average  \\\n",
-       "2013-03-31 00:00:00+02:00  gps_u00  4.132581e+05   288.0       0.033496   \n",
-       "2013-04-30 00:00:00+03:00  gps_u00  2.179693e+06  2032.0       0.269932   \n",
-       "2013-05-31 00:00:00+03:00  gps_u00  6.986551e+06  1903.0       0.351280   \n",
-       "2013-06-30 00:00:00+03:00  gps_u00  2.252893e+05    24.0       0.044126   \n",
-       "2013-03-31 00:00:00+02:00  gps_u01  1.328713e+04   325.0       0.056290   \n",
-       "2013-04-30 00:00:00+03:00  gps_u01  1.238429e+05  2070.0       0.066961   \n",
-       "2013-05-31 00:00:00+03:00  gps_u01  1.228235e+05  3113.0       0.026392   \n",
+       "                              user  log_variance  variance    dist_total  \\\n",
+       "2013-03-31 00:00:00+02:00  gps_u00     -5.761688  0.003146  4.132581e+05   \n",
+       "2013-04-30 00:00:00+03:00  gps_u00     -1.439133  0.237133  2.179693e+06   \n",
+       "2013-05-31 00:00:00+03:00  gps_u00      2.114892  8.288687  6.986551e+06   \n",
+       "2013-06-30 00:00:00+03:00  gps_u00     -4.200287  0.014991  2.252893e+05   \n",
+       "2013-03-31 00:00:00+02:00  gps_u01    -12.520989  0.000004  1.328713e+04   \n",
+       "2013-04-30 00:00:00+03:00  gps_u01    -10.510017  0.000027  1.238429e+05   \n",
+       "2013-05-31 00:00:00+03:00  gps_u01    -11.364454  0.000012  1.228235e+05   \n",
        "\n",
-       "                           speed_variance  speed_max  variance  log_variance  \n",
-       "2013-03-31 00:00:00+02:00        0.044885   1.750000  0.003146     -5.761688  \n",
-       "2013-04-30 00:00:00+03:00        6.129277  33.250000  0.237133     -1.439133  \n",
-       "2013-05-31 00:00:00+03:00        7.590639  34.000000  8.288687      2.114892  \n",
-       "2013-06-30 00:00:00+03:00        0.021490   0.559017  0.014991     -4.200287  \n",
-       "2013-03-31 00:00:00+02:00        0.073370   2.692582  0.000004    -12.520989  \n",
-       "2013-04-30 00:00:00+03:00        0.629393  32.750000  0.000027    -10.510017  \n",
-       "2013-05-31 00:00:00+03:00        0.261978  20.250000  0.000012    -11.364454  "
+       "                           speed_variance  speed_average  n_bins  speed_max  \n",
+       "2013-03-31 00:00:00+02:00        0.044885       0.033496   288.0   1.750000  \n",
+       "2013-04-30 00:00:00+03:00        6.129277       0.269932  2032.0  33.250000  \n",
+       "2013-05-31 00:00:00+03:00        7.590639       0.351280  1903.0  34.000000  \n",
+       "2013-06-30 00:00:00+03:00        0.021490       0.044126    24.0   0.559017  \n",
+       "2013-03-31 00:00:00+02:00        0.073370       0.056290   325.0   2.692582  \n",
+       "2013-04-30 00:00:00+03:00        0.629393       0.066961  2070.0  32.750000  \n",
+       "2013-05-31 00:00:00+03:00        0.261978       0.026392  3113.0  20.250000  "
       ]
      },
      "execution_count": 8,
@@ -1017,9 +1009,9 @@
     {
      "data": {
       "text/plain": [
-       "{<function niimpy.preprocessing.location.location_number_of_significant_places(df, config={})>: {'resample_args': {'rule': '1M'}},\n",
-       " <function niimpy.preprocessing.location.location_significant_place_features(df, config={})>: {'resample_args': {'rule': '1M'}},\n",
-       " <function niimpy.preprocessing.location.location_distance_features(df, config={})>: {'resample_args': {'rule': '1M'}}}"
+       "{<function niimpy.preprocessing.location.location_number_of_significant_places(df, latitude_column='double_latitude', longitude_column='double_longitude', resample_args={'rule': '1ME'}, **kwargs)>: {},\n",
+       " <function niimpy.preprocessing.location.location_significant_place_features(df, latitude_column='double_latitude', longitude_column='double_latitude', speed_column='double_speed', speed_threshold=0.277, resample_args={'rule': '1ME'}, **kwargs)>: {},\n",
+       " <function niimpy.preprocessing.location.location_distance_features(df, latitude_column='double_latitude', longitude_column='double_latitude', speed_column='double_speed', resample_args={'rule': '1ME'}, **kwargs)>: {}}"
       ]
      },
      "execution_count": 9,
@@ -1203,7 +1195,7 @@
    ],
    "source": [
     "# customized function\n",
-    "def max_speed(df, feature_arg):\n",
+    "def max_speed(df):\n",
     "    grouped = df.groupby('user')\n",
     "    df = grouped['double_speed'].max().reset_index('user')\n",
     "    return df\n",
@@ -1232,7 +1224,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.4"
+   "version": "3.12.6"
   }
  },
  "nbformat": 4,
diff --git a/niimpy/preprocessing/location.py b/niimpy/preprocessing/location.py
index 2ec7249f..7101a3f1 100644
--- a/niimpy/preprocessing/location.py
+++ b/niimpy/preprocessing/location.py
@@ -261,16 +261,15 @@ def number_of_significant_places(lats, lons, times):
     return np.nanmedian(sps)
 
 
-def location_number_of_significant_places(df, config=None):
+def location_number_of_significant_places(
+        df,
+        latitude_column="double_latitude",
+        longitude_column="double_longitude",
+        resample_args={"rule": default_freq},
+        **kwargs
+    ):
     """Computes number of significant places """
     assert isinstance(df, pd.DataFrame), "df_u is not a pandas dataframe"
-    if config is None:
-        config = {}
-    assert isinstance(config, dict), "config is not a dictionary"
-    
-    latitude_column = config.get("latitude_column", "double_latitude")
-    longitude_column = config.get("longitude_column", "double_longitude")
-    config["resample_args"] = config.get("resample_args", {"rule": default_freq})
 
     def compute_features(df):
         df = df.sort_index()  # sort based on time
@@ -288,7 +287,7 @@ def compute_features(df):
         })
         return row
     
-    result = util.group_data(df).resample(**config["resample_args"], include_groups=False).apply(compute_features)
+    result = util.group_data(df).resample(**resample_args, include_groups=False).apply(compute_features)
     result = util.reset_groups(result)
     result = util.select_columns(result, ["n_significant_places"])
     return result
@@ -326,7 +325,15 @@ def compute_nbin_maxdist_home(lats, lons, latlon_home, home_radius=50):
     return time_home, max_dist_home
 
 
-def location_significant_place_features(df, config=None):
+def location_significant_place_features(
+        df,
+        latitude_column="double_latitude",
+        longitude_column="double_latitude",
+        speed_column="double_speed",
+        speed_threshold=0.277,
+        resample_args={"rule": default_freq},
+        **kwargs
+    ):
     """Calculates features related to Significant Places.
     
     Parameters
@@ -341,15 +348,6 @@ def location_significant_place_features(df, config=None):
         resample_args: a dictionary of arguments for the Pandas resample function. For example to resample by hour, you would pass {"rule": "1h"}.
     """
     assert isinstance(df, pd.DataFrame), "df_u is not a pandas dataframe"
-    if config is None:
-        config = {}
-    assert isinstance(config, dict), "config is not a dictionary"
-
-    latitude_column = config.get("latitude_column", "double_latitude")
-    longitude_column = config.get("longitude_column", "double_latitude")
-    speed_column = config.get("speed_column", "double_speed")
-    speed_threshold = config.get("speed_threshold", 0.277)
-    config["resample_args"] = config.get("resample_args", {"rule": default_freq})
 
     def compute_features(df):
         """Compute features for a single user"""
@@ -421,13 +419,20 @@ def compute_features(df):
         })
         return row
 
-    result = util.group_data(df).resample(**config["resample_args"], include_groups=False).apply(compute_features)
+    result = util.group_data(df).resample(**resample_args, include_groups=False).apply(compute_features)
     result = util.reset_groups(result)
     result = util.select_columns(result, ["n_sps", "n_static", "n_moving", "n_rare", "n_home", "max_dist_home", "n_transitions", "n_top1", "n_top2", "n_top3", "n_top4", "n_top5", "entropy", "normalized_entropy"])
     return result
 
 
-def location_distance_features(df, config=None):
+def location_distance_features(
+        df,
+        latitude_column="double_latitude",
+        longitude_column="double_latitude",
+        speed_column="double_speed",
+        resample_args={"rule": default_freq},
+        **kwargs
+    ):
     """Calculates features related to distance and speed.
     
     Parameters
@@ -442,14 +447,6 @@ def location_distance_features(df, config=None):
         resample_args: a dictionary of arguments for the Pandas resample function. For example to resample by hour, you would pass {"rule": "1h"}.
     """
     assert isinstance(df, pd.DataFrame), "df_u is not a pandas dataframe"
-    if config is None:
-        config = {}
-    assert isinstance(config, dict), "config is not a dictionary"
-
-    latitude_column = config.get("latitude_column", "double_latitude")
-    longitude_column = config.get("longitude_column", "double_latitude")
-    speed_column = config.get("speed_column", "double_speed")
-    config["resample_args"] = config.get("resample_args", {"rule": default_freq})
 
     def compute_features(df):
         """Compute features for a single user and given time interval"""
@@ -488,7 +485,7 @@ def compute_features(df):
         })
         return row
 
-    result = util.group_data(df).resample(**config["resample_args"], include_groups=False).apply(compute_features)
+    result = util.group_data(df).resample(**resample_args, include_groups=False).apply(compute_features)
     result = util.reset_groups(result)
     result = util.select_columns(result, ["dist_total", "n_bins", "speed_average", "speed_variance", "speed_max", "variance", "log_variance"])
     return result
@@ -533,7 +530,7 @@ def extract_features_location(df, features=None):
 
     computed_features = []
     for features, feature_arg in features.items():
-        computed_feature = features(df, feature_arg)
+        computed_feature = features(df, **feature_arg)
         computed_feature = util.set_conserved_index(computed_feature)
         computed_features.append(computed_feature)