Final changes to metric generation script