Reorganise tokens supply and add indexed tokens
Further tidy up of indexed tokens