Added state rank field
Updating some fields and operators