Updated Order PK generation strategy.