Final additions to Warden.