Better identity integration