Closes #89. Added additional fields to index