Add bit more client config