Changed question object structure