Added config options for enabling modules - Part 2