Adaptation to latest Batteries