Added options for more modules.