Added soft deletion support