Better handling of cluster settings