Added indexes handling