Added support for extra question types