Add basic index support with version check