Moved questions into module