Added remaining required modules and headers