Added survey support