Improved energy storage is provided by exploiting two physical effects in combination. The first effect can be referred to as the All-Electron Battery (AEB) effect, and relates to the use of inclusions embedded in a dielectric structure between two electrodes of a capacitor. Electrons can tunnel through the dielectric between the electrodes and the inclusions, thereby increasing the charge storage density relative to a conventional capacitor. The second effect can be referred to as an area enhancement effect, and relates to the use of micro-structuring or nano-structuring on one or both of the electrodes to provide an enhanced interface area relative to the electrode geometrical area. Area enhancement is advantageous for reducing the self-discharge rate of the device.