Added logs and more modules