Added vsdatapoint mapping