Updates to locations and hierarchy