Adding location normalization