Added identity validation