Improved the setup script