diff --git a/src/parser.rs b/src/parser.rs
index 6bd46a1..5887a61 100644
--- a/src/parser.rs
+++ b/src/parser.rs
@@ -54,7 +54,7 @@ impl_rdp! {
         zombie_mode =  { ["0"] | ["1"] }
         zombie      =  { ["Z"] ~ zombie_mode }

-        data_field  =  { voltage | temperature | humidity | pressure | custom |
+        data_field  =  { voltage | current | temperature | humidity | pressure | custom |
                         sun  | rssi | windspeed | location | count | zombie }

         data        =   { data_field* }
@@ -62,7 +62,8 @@ impl_rdp! {
         message_content     =  { (letter | digit | symbol)* }
         message             =  { [":"] ~ message_content }

-        node_name_content   =  { (uppercase_letter | digit)* }
+        node_name_symbol    = _{ ["-"] | ["/"] | ["."] | ["_"] | ["+"] | ["#"] }
+        node_name_content   =  { (letter | digit | node_name_symbol)* }
         node_name           =  { node_name_content }

         path        =  { ["["] ~ node_name ~ ( [","] ~ node_name )* ~ ["]"] }