Convert to use dataRepository scheme