small dal refactoring
Merge branch