Added remaining modules
Added remaining modules