AJ-1573 improving new data workflow