Adding the ability to create index on keys and the ability to use multiple tables