Generate index little upgrade