Updated setup scripts