Updated dict passing for modularity