Adding wrapgen features