Add previous two modules to build