Rework dictionary logic in plot creation