Updated generation code. Got the cpp component working.