Add dereliction support