ND: Add better committee handling