Refactoring of Dao and Dto classes