Switching decorator order to be able to validate all metric parameters for #45