Added timer-based reindex and removed uneeded BUCKET constant