Added identifier index in places