fix data access dependencies