Add span normalization