Updated with more modules