Added point data extraction