Refactoring of Dasha classes