Added instantiation of individual modulesg