More deletion support