Changes to accomodate the new Delegates domain