Added missing data access layer