Changes to the device module