Added support for normalization.