Removed some unnecessary templates. Added new indexing class for datasets.