diff --git a/diagrams/data_structures/netdata_config.svg b/diagrams/data_structures/netdata_config.svg
index 7612a0f3627109..fdecf777796fe1 100644
--- a/diagrams/data_structures/netdata_config.svg
+++ b/diagrams/data_structures/netdata_config.svg
@@ -1 +1 @@
-struct config struct section *sections netdata_mutex_t mutex avl_tree_lock index struct section avl avl uint32_t hash char *name struct section *next struct config_option *values avl_tree_lock values_index netdata_mutex_t mutex struct avl_tree_lock avl_tree avl_tree netdata_mutex_t mutex struct avl_tree avl *root int (*compar)(void *a, void *b) linked list of struct avl struct avl *avl_link[2] signed char avl_balance struct config_options avl avl uint8_t flags uint32_t hash char *name char *value struct *config_option_next avl tree of avl tree of linked list of struct config struct section *sections netdata_mutex_t mutex avl_tree_lock index struct section avl avl uint32_t hash char *name struct section *next struct config_option *values avl_tree_lock values_index netdata_mutex_t mutex struct avl_tree_lock avl_tree avl_tree netdata_mutex_t mutex struct avl_tree avl *root int (*compar)(void *a, void *b) linked list of struct avl struct avl *avl_link[2] signed char avl_balance struct config_options avl avl uint8_t flags uint32_t hash char *name char *value struct *config_option_next avl tree of avl tree of linked list of dictionary of avl tree of struct registry int enabled entries counters unsigned long long persons_count unsigned long long machines_count unsigned long long usages count unsigned long long urls_count unsigned long long persons_urls_count unsigned long long machines_urls_count unsigned long long log_count memory counters unsigned long long persons memory unsigned long long machines_memory unsigned long long urls_memory unsigned long long persons_urls_memory unsigned long longmachines_urls_memory configuration unsigned long long save_registry_every_entries char *registry_domain char *hostname char *registry_to_announce time_t persons_expiration int verify_cookies_redirects size_t max_url_length size_t max_name_length path names char *pathname char *db_filename char *log_filename char *machine_guid_filename FILE *log_fp DICTIONARY *persons DICTIONARY *machines avl_tree registry_urls_root_index netdata_mutex_t lock DICTIONARY avl_tree values_index uint8_t flags struct dictionary_stats *stats netdata_rwlock_t *rwlock struct avl_tree avl *root int (*compar)(void *a, void *b) struct avl struct avl *avl_link[2] signed char avl_balance struct dictionary_stats unsigned long long inserts unsigned long long deletes unsigned long long searches unsigned long long entries NAME_VALUE avl avl uint32_t hash char *name void *value REGISTRY_PERSON char guid[GUID_LEN + 1] avl_tree person_urls uint32_t fist_t uint32_t last_t uint32_t usages REGISTRY_PERSON_URL avl avl REGISTRY_URL *url REGISTRY_MACHINE *machine uint8_t flags uint32_t first_t uint32_t last_t uint32_t usages char machine_name[1] REGISTRY_URL avl avl uint32_t hash uint32_t links uint16_t len char url[1] REGISTRY_MACHINE char guid[GUID_LEN + 1] uint32_t links DICTIONARY *machine_urls uint32_t first_t uint32_t last_t uint32_t usages REGISTRY_MACHINE_URL REGISTRY_URL *url uint8_t flags uint32_t first_t uint32_t last_t uint32_t usages dictionary of avl tree of avl tree of dictionary of dictionary of avl tree of struct registry int enabled entries counters unsigned long long persons_count unsigned long long machines_count unsigned long long usages count unsigned long long urls_count unsigned long long persons_urls_count unsigned long long machines_urls_count unsigned long long log_count memory counters unsigned long long persons memory unsigned long long machines_memory unsigned long long urls_memory unsigned long long persons_urls_memory unsigned long longmachines_urls_memory configuration unsigned long long save_registry_every_entries char *registry_domain char *hostname char *registry_to_announce time_t persons_expiration int verify_cookies_redirects size_t max_url_length size_t max_name_length path names char *pathname char *db_filename char *log_filename char *machine_guid_filename FILE *log_fp DICTIONARY *persons DICTIONARY *machines avl_tree registry_urls_root_index netdata_mutex_t lock DICTIONARY avl_tree values_index uint8_t flags struct dictionary_stats *stats netdata_rwlock_t *rwlock struct avl_tree avl *root int (*compar)(void *a, void *b) struct avl struct avl *avl_link[2] signed char avl_balance struct dictionary_stats unsigned long long inserts unsigned long long deletes unsigned long long searches unsigned long long entries NAME_VALUE avl avl uint32_t hash char *name void *value REGISTRY_PERSON char guid[GUID_LEN + 1] avl_tree person_urls uint32_t fist_t uint32_t last_t uint32_t usages REGISTRY_PERSON_URL avl avl REGISTRY_URL *url REGISTRY_MACHINE *machine uint8_t flags uint32_t first_t uint32_t last_t uint32_t usages char machine_name[1] REGISTRY_URL avl avl uint32_t hash uint32_t links uint16_t len char url[1] REGISTRY_MACHINE char guid[GUID_LEN + 1] uint32_t links DICTIONARY *machine_urls uint32_t first_t uint32_t last_t uint32_t usages REGISTRY_MACHINE_URL REGISTRY_URL *url uint8_t flags uint32_t first_t uint32_t last_t uint32_t usages dictionary of avl tree of avl tree of dictionary of RRDDIM avl avl ... dimension definition ... temporary data struct rrddim *next struct rrdsset *rrdset ... disk data checking struct rrddimvar *variables storage_number values[] RRDSET avl avl avl avlname ... set configuration ... temporary data RRDFAMILY *rrdfamily RRDHOST *rrdhost struct rrdset *next ... local variables avl_tree_lock rrdvar_root_index RRDSETVAR *variables RRDCALC *alarms ... disk data checking avl_tree_lock dimensions_index RRDDIM *dimensions avl tree of avl tree of avl tree of RRDFAMILY avl avl const char *family uint32_t hash_family size_t use_count avl_tree_lock rrdvar_root_index RRDHOST avl avl ... host information ... streaming ... health monitoring options RRDCALC *alarms ... health monitoring options ALARM_LOG health_log uint32_t health_last_processed_id uint32_t health_max_unique_id uint32_t health_max_alarm_id RRDCALCTEMPLATE *templates RRDSET *rrdset_root netdata_rwlock_t rrdhost_rwlock ... indexes avl_tree_lock rrdset_root_index avl_tree_lock rrdset_root_index_name avl_tree_lock rrdfamily_root_index avl_tree_lock rrdvar_root_index struct rrdhost *next RRDVAR avl avl char *name uint32_t hash RRDVAR_TYPE type RRDVAR_OPTIONS options void *value time_t last_updated RRDSETVAR char *variable uint32_t hash char *key_fullid char *key_fullname RRDVAR_TYPE type void *value RRDVAR_OPTIONS options RRDVAR *var_local RRDVAR *var_family RRDVAR *var_host RRDVAR *var_family_name RRDVAR *var_host_name struct rrdset *rrdset struct rrdsetvar *next RRDDIMVAR char *prefix char *suffix char *key_id char *key_name char *key_contextid char *key_contexname char *key_fullidid char *key_fullidname char *key_fullnameid char *key_fullnamename RRDVAR_TYPE type void *value RRDVAR_OPTIONS options RRDVAR *var_local_id RRDVAR *var_local_name RRDVAR *var_family_id RRDVAR *var_family_name RRDVAR *var_family_contextid RRDVAR *var_family_contextname RRDVAR *var_host_chartidid RRDVAR *var_host_chartidname RRDVAR *var_host_chartnameid RRDVAR *var_host_chartnamename struct rrddim *rrddim struct rrddimvar *next linked list of avl tree of avl tree of linked list of linked list of avl tree of ALARM_LOG uint32_t next_log_id uint32_t next_alarm_id unsigned int count unsigned int max ALARM_ENTRY *alarms netdata_rwlock_t alarm_log_rwlock linked list of ALARM_ENTRY * ... struct alarm_entry *next RRDCALC ... EVAL_EXPRESSION *calculation EVAL_EXPRESSION *warning EVAL_EXPRESSION *critical ... RRDVAR *local RRDVAR *family RRDVAR *hostid RRDVAR *hostname struct rrdset *rrdset struct rrdcalc *rrdset_next struct rrdcalc *rrdset_prev struct rrdcalc *next RRDCALCTEMPLATE * ... EVAL_EXPRESSION *calculation EVAL_EXPRESSION *warning EVAL_EXPRESSION *critical struct rrdcalctemplate *next linked list of double linked list of linked list of linked list of EVAL_EXPRESSION const char *source const char *parsed_as RRDCALC_STATUS *status calculated_number *this time_t *after time_t *before calculated_number result int error BUFFER *error_msg void *nodes struct rrdcalc_rrdcalc EVAL_NODE int id unsigned char operator in precedence int count EVAL_VALUE ops[] EVAL_VALUE calculated_number number EVAL_VARIABLE *variable struct eval_node *expression EVAL_VARIABLE char *name uint32_t hash struct eval_variable *next avl tree of RRDDIM avl avl ... dimension definition ... temporary data struct rrddim *next struct rrdsset *rrdset ... disk data checking struct rrddimvar *variables storage_number values[] RRDSET avl avl avl avlname ... set configuration ... temporary data RRDFAMILY *rrdfamily RRDHOST *rrdhost struct rrdset *next ... local variables avl_tree_lock rrdvar_root_index RRDSETVAR *variables RRDCALC *alarms ... disk data checking avl_tree_lock dimensions_index RRDDIM *dimensions avl tree of avl tree of avl tree of RRDFAMILY avl avl const char *family uint32_t hash_family size_t use_count avl_tree_lock rrdvar_root_index RRDHOST avl avl ... host information ... streaming ... health monitoring options RRDCALC *alarms ... health monitoring options ALARM_LOG health_log uint32_t health_last_processed_id uint32_t health_max_unique_id uint32_t health_max_alarm_id RRDCALCTEMPLATE *templates RRDSET *rrdset_root netdata_rwlock_t rrdhost_rwlock ... indexes avl_tree_lock rrdset_root_index avl_tree_lock rrdset_root_index_name avl_tree_lock rrdfamily_root_index avl_tree_lock rrdvar_root_index struct rrdhost *next RRDVAR avl avl char *name uint32_t hash RRDVAR_TYPE type RRDVAR_OPTIONS options void *value time_t last_updated RRDSETVAR char *variable uint32_t hash char *key_fullid char *key_fullname RRDVAR_TYPE type void *value RRDVAR_OPTIONS options RRDVAR *var_local RRDVAR *var_family RRDVAR *var_host RRDVAR *var_family_name RRDVAR *var_host_name struct rrdset *rrdset struct rrdsetvar *next RRDDIMVAR char *prefix char *suffix char *key_id char *key_name char *key_contextid char *key_contexname char *key_fullidid char *key_fullidname char *key_fullnameid char *key_fullnamename RRDVAR_TYPE type void *value RRDVAR_OPTIONS options RRDVAR *var_local_id RRDVAR *var_local_name RRDVAR *var_family_id RRDVAR *var_family_name RRDVAR *var_family_contextid RRDVAR *var_family_contextname RRDVAR *var_host_chartidid RRDVAR *var_host_chartidname RRDVAR *var_host_chartnameid RRDVAR *var_host_chartnamename struct rrddim *rrddim struct rrddimvar *next linked list of avl tree of avl tree of linked list of linked list of avl tree of ALARM_LOG uint32_t next_log_id uint32_t next_alarm_id unsigned int count unsigned int max ALARM_ENTRY *alarms netdata_rwlock_t alarm_log_rwlock linked list of ALARM_ENTRY * ... struct alarm_entry *next RRDCALC ... EVAL_EXPRESSION *calculation EVAL_EXPRESSION *warning EVAL_EXPRESSION *critical ... RRDVAR *local RRDVAR *family RRDVAR *hostid RRDVAR *hostname struct rrdset *rrdset struct rrdcalc *rrdset_next struct rrdcalc *rrdset_prev struct rrdcalc *next RRDCALCTEMPLATE * ... EVAL_EXPRESSION *calculation EVAL_EXPRESSION *warning EVAL_EXPRESSION *critical struct rrdcalctemplate *next linked list of double linked list of linked list of linked list of EVAL_EXPRESSION const char *source const char *parsed_as RRDCALC_STATUS *status calculated_number *this time_t *after time_t *before calculated_number result int error BUFFER *error_msg void *nodes struct rrdcalc_rrdcalc EVAL_NODE int id unsigned char operator in precedence int count EVAL_VALUE ops[] EVAL_VALUE calculated_number number EVAL_VARIABLE *variable struct eval_node *expression EVAL_VARIABLE char *name uint32_t hash struct eval_variable *next avl tree of web_client unsigned long long id WEB_CLIENT_FLAGS flags WEB_CLIENT_MODE mode WEB_CLIENT_ACL acl size_t header_parse_tries size_t header_parse_last_size int tcp_cork int ifd int ofd char client_ip[NI_MAXHOST+1} char client_port[NI_MAXSERV+1] char decoded_url[NETDATA_WEB_REQUEST_URL_SIZE+1 char last_url[NETDATA_WEB_REQUEST_URL_SIZE+1] struct timeval tv_in, tv_ready char cookie1[NETDATA_WEB_REQUEST_COOKIE_SIZE+1] char cookie2[NETDATA_WEB_REQUEST_COOKIE_SIZE+1] char origin[NETDATA_WEB_REQUEST_ORIGIN_HEADER_SIZE+1] char *user_agent struct response response size_t stats_received_bytes size_t stats_sent_bytes struct web_client *prev double linked list of struct web_client *next netdata_thread_t thread volatile int running size_t pollinfo_slot size_t pollinfo_filecopy_slot response BUFFER *header BUFFER *header_output BUFFER *data int code size_t rlen size_t sent int zoutput z_stream zstream Bytef zbuffer[NETDATA_WEB_RESPONSE_ZLIB_CHUNK_SIZE] size_t zsent size_t zhave unsigned int zinitialized clients_cache pid_t pid struct web_client *used size_t used_count struct web_client *avail size_t avail_count size_t reused size_t allocated linked list of linked list of listen_sockets struct config *config const char *config_section const char *default_bind_to uint16_t default_port int backlog size_t opened size_t failed int fds[MAX_LISTEN_FDS] int *fds_names[MAX_LISTEN_FDS] int fds_types[MAX_LISTEN_FDS] int fds_families[MAX_LISTEN_FDS] POLLINFO POLLJOB *p size_t slot int fd int socktype char *client_ip char *client_port time_t connected_t time_t last_received_t time_t last_sent_t size_t recv_count size_t send_count uint32_t flags void (*del_callback) int (*rcv_callback) int (*snd_callback) void *data struct pollinfo *next POLLJOB size_t slots size_t used size_t min size_t max size_t limit time_t complete_request_timeout time_t idle_timeout time_t check_every time_t timer_milliseconds void *timer_data struct pollfd *fds struct pollinfo *inf struct pollinfo *first_free SIMPLE_PATTERN *access_list void *(*add_callback) void (*dell_callback) int (*rcv_callback) int (*snd_callback) void (*tmr_callback) web_client unsigned long long id WEB_CLIENT_FLAGS flags WEB_CLIENT_MODE mode WEB_CLIENT_ACL acl size_t header_parse_tries size_t header_parse_last_size int tcp_cork int ifd int ofd char client_ip[NI_MAXHOST+1} char client_port[NI_MAXSERV+1] char decoded_url[NETDATA_WEB_REQUEST_URL_SIZE+1 char last_url[NETDATA_WEB_REQUEST_URL_SIZE+1] struct timeval tv_in, tv_ready char cookie1[NETDATA_WEB_REQUEST_COOKIE_SIZE+1] char cookie2[NETDATA_WEB_REQUEST_COOKIE_SIZE+1] char origin[NETDATA_WEB_REQUEST_ORIGIN_HEADER_SIZE+1] char *user_agent struct response response size_t stats_received_bytes size_t stats_sent_bytes struct web_client *prev double linked list of struct web_client *next netdata_thread_t thread volatile int running size_t pollinfo_slot size_t pollinfo_filecopy_slot response BUFFER *header BUFFER *header_output BUFFER *data int code size_t rlen size_t sent int zoutput z_stream zstream Bytef zbuffer[NETDATA_WEB_RESPONSE_ZLIB_CHUNK_SIZE] size_t zsent size_t zhave unsigned int zinitialized clients_cache pid_t pid struct web_client *used size_t used_count struct web_client *avail size_t avail_count size_t reused size_t allocated linked list of linked list of listen_sockets struct config *config const char *config_section const char *default_bind_to uint16_t default_port int backlog size_t opened size_t failed int fds[MAX_LISTEN_FDS] int *fds_names[MAX_LISTEN_FDS] int fds_types[MAX_LISTEN_FDS] int fds_families[MAX_LISTEN_FDS] POLLINFO POLLJOB *p size_t slot int fd int socktype char *client_ip char *client_port time_t connected_t time_t last_received_t time_t last_sent_t size_t recv_count size_t send_count uint32_t flags void (*del_callback) int (*rcv_callback) int (*snd_callback) void *data struct pollinfo *next POLLJOB size_t slots size_t used size_t min size_t max size_t limit time_t complete_request_timeout time_t idle_timeout time_t check_every time_t timer_milliseconds void *timer_data struct pollfd *fds struct pollinfo *inf struct pollinfo *first_free SIMPLE_PATTERN *access_list void *(*add_callback) void (*dell_callback) int (*rcv_callback) int (*snd_callback) void (*tmr_callback)