Preparing to add User Defined metrics