Add more modules and fixes