More API work
Mark EnergyValueRegistryProxy as final