Don't pass around Id type anymore. Fix top degree aggregation