Make API responsible for plan order rather than implementation
Create new version