Improve DataNormalizer performance