Updates to use configuration files