Extended with support of new data API