DAL reworked to new system