Normalization is now optional based on configuration