Adding in more modules and settings