Updated client to use PublicIdentity where appropriate