added device model to deviceType
removed hardware from deviceType