[WIP][3.9] Add subdef generator service