Added theater service and refactored the questions