Added some more variables and modules to control them