Added support for normalized data.