update files for removing data access logic