Updated Indexes to use tables