Added handling of only part of the indexes