Finish initial implementation of IndexDefinition

Change-Id: I05290e0ce4e2b3459436632ddecc81ccab37db32