Refactored - Delete/Insert changed to rekey