More organization of simulation params