extend client schema with linked fields
minor changes