added Question model, updated other models