Simplifying indexes and terminology
Merge pull request #8 from jmcanterafonseca/merge_global_datastore

Polishing a bit the code. Removing not necessary indexes