Added type specification to locations.