Merge settings and client into one