add Client and Query classes