Added more modules
Added vendor stuff