Added device field definitions