CLIO-16722 move to nested dictionaries