diff --git a/pmbus.hpp b/pmbus.hpp
index fc269ac..d384279 100644
--- a/pmbus.hpp
+++ b/pmbus.hpp
@@ -10,10 +10,24 @@
 {
 
 /**
+ * If the access should be done in the base
+ * device directory or the hwmon directory.
+ */
+enum class Type
+{
+    Base,
+    Hwmon
+};
+
+/**
  * @class PMBus
  *
  * This class is an interface to communicating with PMBus devices
  * by reading and writing sysfs files.
+ *
+ * Based on the Type parameter, the accesses can either be done
+ * in the base device directory (the one passed into the constructor),
+ * or in the hwmon directory for the device.
  */
 class PMBus
 {
@@ -34,6 +48,7 @@
         PMBus(const std::string& path) :
             basePath(path)
         {
+            findHwmonRelativePath();
         }
 
         /**
@@ -42,10 +57,11 @@
          *
          * @param[in] name - path concatenated to
          *                   basePath to read
+         * @param[in] type - either Base or Hwmon
          *
          * @return bool - false if result was 0, else true
          */
-        bool readBit(const std::string& name);
+        bool readBit(const std::string& name, Type type);
 
         /**
          * Reads a file in sysfs that represents a single bit,
@@ -55,11 +71,13 @@
          * @param[in] name - path concatenated to
          *                   basePath to read
          * @param[in] page - page number
+         * @param[in] type - either Base or Hwmon
          *
          * @return bool - false if result was 0, else true
          */
         bool readBitInPage(const std::string& name,
-                           size_t page);
+                           size_t page,
+                           Type type);
 
         /**
          * Writes an integer value to the file, therefore doing
@@ -68,8 +86,9 @@
          * @param[in] name - path concatenated to
          *                   basePath to write
          * @param[in] value - the value to write
+         * @param[in] type - either Base or Hwmon
          */
-        void write(const std::string& name, int value);
+        void write(const std::string& name, int value, Type type);
 
         /**
          * Returns the sysfs base path of this device
@@ -95,6 +114,12 @@
         static std::string insertPageNum(const std::string& templateName,
                                          size_t page);
 
+        /**
+         * Finds the path relative to basePath to the hwmon directory
+         * for the device and stores it in hwmonRelPath.
+         */
+         void findHwmonRelativePath();
+
     private:
 
         /**
@@ -102,6 +127,11 @@
          */
         std::experimental::filesystem::path basePath;
 
+        /**
+         * The relative (to basePath) path to the hwmon directory
+         */
+        std::experimental::filesystem::path hwmonRelPath;
+
 };
 
 }