Move to Batteries 2.0