Update for new nmcli and battery