Added indexes to schema