Added client map visitor