Stop using auto indexes

Resolves #284