moved dictionary to containers