Add back in the external groups stuff.