Adding BatteryStatus support