Updated metering toolbox