Add indexes

Closes #3