More progress for Feature/FileNewConfig