Changed the user row mapper to include country