Add native KGW code
Add native KGW support