Added questions for modular design