added location name and type