Add battery and location