Added config variables
Minor Updates