Improved vector data handling