Changes to apigen