Added all_site and all_vo aggregations