Added more questions and refactored the setup