Added locations calculation essential for the validator