Identity check improvements