Changes to dynamic setup