changes to support multiple dimensions and measures
Add sort handler