New record handling, smarter delete