Feature/move dag to core