Questions module refactored