Added batterie support and almost bucket support