Some changes towards 2.0.