Advertise index refactor