Added support for score normalization