WIP: Add indexes