Updated nested dict and some plots