More work on creating index