Added more options to setup script