Updates to move variables to config files