Add support for multiple survey types