Improvements to POS data generation