Re-factor the way how we expect data for client identification.