Added data access layer