Patch 1

Fixed DeviceClass and added save data function for device