Updated measurement period and associated range type
Added new variable types to json criteria