Add more opindex overrides