Add support for selecting measures
Remove prev.year.cols option