dto's refactoroed