added index support