Index support improvements

Added index support for all classes that implements indexing
Merge pull request #58 from flts/feature/index

Index support improvements