Improve "genericness" in DataRepository a bit