Starting to add dependencies for data access