Updates for dataFormatter

And restrict to 1.9.x, for future updates.