Added stale object support