BS-8439, add index on table creation