Setup scripts updated