Optional index creation.  Closes #1