CON-605: Use data provider