Implementing Index support - Fixes #48