Setup script changes