Updated question class