Update POGenerator, with asserts