Hard refactoring of the DAL finished