Advanced Electricity Variables and Units