Move remaining data access to repo