map client, query and guzzle adapter
update query builder
client query factory