More changes for kgw implementation

More changes for kgw implementation