Renamed fields and added indexing of paradigms