Removed commId and commProtocolId, added deviceId