Added remaining modules