Add data access and domain layer update