Added initialization of modules