Rebased with non lazy index creation