Added more configuration to setup script