Added some more variables/settings