Added normalization handling