Add indexes and adjust COMM & TBL9 schema.