Added drop index support