Modified public index and set ID's