refactoring v2 dalgenerator