Separated the DataAccess structure