Renamed Public to Index and relevant fields