Add support for multiple batteries