Index support improvements

Added index support for all classes that implements indexing