Changed Data to Survey as per Issue #61