Added battery support