Better support for Identity 2.0