diff --git a/include/nfc/nfc.h b/include/nfc/nfc.h
index df87c233..97457ef2 100644
--- a/include/nfc/nfc.h
+++ b/include/nfc/nfc.h
@@ -73,8 +73,6 @@ extern  "C" {
   NFC_EXPORT int nfc_abort_command (nfc_device *pnd);
   NFC_EXPORT size_t nfc_list_devices (nfc_context *context, nfc_connstring connstrings[], size_t connstrings_len);
   NFC_EXPORT int nfc_idle (nfc_device *pnd);
-  NFC_EXPORT int nfc_device_get_supported_modulation (nfc_device *pnd, const nfc_mode mode,  nfc_modulation_type **supported_mt);
-  NFC_EXPORT int nfc_device_get_supported_baud_rate (nfc_device *pnd, const nfc_modulation_type nmt, nfc_baud_rate **supported_br);
 
 /* NFC initiator: act as "reader" */
   NFC_EXPORT int nfc_initiator_init (nfc_device *pnd);
@@ -105,6 +103,8 @@ extern  "C" {
 /* Special data accessors */
   NFC_EXPORT const char *nfc_device_get_name (nfc_device *pnd);
   NFC_EXPORT const char *nfc_device_get_connstring (nfc_device *pnd);
+  NFC_EXPORT int nfc_device_get_supported_modulation (nfc_device *pnd, const nfc_mode mode,  const nfc_modulation_type **const supported_mt);
+  NFC_EXPORT int nfc_device_get_supported_baud_rate (nfc_device *pnd, const nfc_modulation_type nmt, const nfc_baud_rate **const supported_br);
 
 /* Properties accessors */
   NFC_EXPORT int nfc_device_set_property_int (nfc_device *pnd, const nfc_property property, const int value);
diff --git a/libnfc/nfc-internal.h b/libnfc/nfc-internal.h
index 3ff83008..ec9e2fc6 100644
--- a/libnfc/nfc-internal.h
+++ b/libnfc/nfc-internal.h
@@ -151,8 +151,8 @@ struct nfc_driver {
 
   int (*device_set_property_bool) (struct nfc_device *pnd, const nfc_property property, const bool bEnable);
   int (*device_set_property_int) (struct nfc_device *pnd, const nfc_property property, const int value);
-  int (*get_supported_modulation) (struct nfc_device *pnd, const nfc_mode mode, nfc_modulation_type **supported_mt);
-  int (*get_supported_baud_rate) (struct nfc_device *pnd, const nfc_modulation_type nmt, nfc_baud_rate **supported_br);
+  int (*get_supported_modulation) (struct nfc_device *pnd, const nfc_mode mode, const nfc_modulation_type **const supported_mt);
+  int (*get_supported_baud_rate) (struct nfc_device *pnd, const nfc_modulation_type nmt, const nfc_baud_rate **const supported_br);
 
   int (*abort_command) (struct nfc_device *pnd);
   int (*idle) (struct nfc_device *pnd);
diff --git a/libnfc/nfc.c b/libnfc/nfc.c
index 43fa6248..5a82ab61 100644
--- a/libnfc/nfc.c
+++ b/libnfc/nfc.c
@@ -270,34 +270,6 @@ nfc_list_devices (nfc_context *context, nfc_connstring connstrings[] , size_t sz
   return szDeviceFound;
 }
 
-/** @ingroup dev
- * @brief Get supported modulations.
- * @return Returns 0 on success, otherwise returns libnfc's error code (negative value)
- * @param pnd \a nfc_device struct pointer that represent currently used device
- * @param mode \a nfc_mode.
- * @param supported_mt pointer of \a nfc_modulation_type array.
- * 
- */
-int 
-nfc_device_get_supported_modulation (nfc_device *pnd, const nfc_mode mode,  nfc_modulation_type **supported_mt)
-{
-  HAL (get_supported_modulation, pnd, mode, supported_mt);
-}
-
-/** @ingroup dev
- * @brief Get supported baud rates.
- * @return Returns 0 on success, otherwise returns libnfc's error code (negative value)
- * @param pnd \a nfc_device struct pointer that represent currently used device
- * @param nmt \a nfc_modulation_type.
- * @param supported_br pointer of \a nfc_baud_rate array.
- * 
- */
-int 
-nfc_device_get_supported_baud_rate (nfc_device *pnd, const nfc_modulation_type nmt, nfc_baud_rate **supported_br)
-{
-  HAL (get_supported_baud_rate, pnd, nmt, supported_br);
-}
-
 /** @ingroup properties
  * @brief Set a device's integer-property value
  * @return Returns 0 on success, otherwise returns libnfc's error code (negative value)
@@ -1017,6 +989,34 @@ nfc_device_get_connstring (nfc_device *pnd)
   return pnd->connstring;
 }
 
+/** @ingroup data
+ * @brief Get supported modulations.
+ * @return Returns 0 on success, otherwise returns libnfc's error code (negative value)
+ * @param pnd \a nfc_device struct pointer that represent currently used device
+ * @param mode \a nfc_mode.
+ * @param supported_mt pointer of \a nfc_modulation_type array.
+ * 
+ */
+int 
+nfc_device_get_supported_modulation (nfc_device *pnd, const nfc_mode mode, const nfc_modulation_type **const supported_mt)
+{
+  HAL (get_supported_modulation, pnd, mode, supported_mt);
+}
+
+/** @ingroup data
+ * @brief Get supported baud rates.
+ * @return Returns 0 on success, otherwise returns libnfc's error code (negative value)
+ * @param pnd \a nfc_device struct pointer that represent currently used device
+ * @param nmt \a nfc_modulation_type.
+ * @param supported_br pointer of \a nfc_baud_rate array.
+ * 
+ */
+int 
+nfc_device_get_supported_baud_rate (nfc_device *pnd, const nfc_modulation_type nmt, const nfc_baud_rate **const supported_br)
+{
+  HAL (get_supported_baud_rate, pnd, nmt, supported_br);
+}
+
 /* Misc. functions */
 
 /** @ingroup misc