refactoring, use some more config parameters during generation