data access layer modified