Modified the new metric wizard