add window aggregate metric support