Adding some modules and expansions