Added battery and charge monitoring