Improve @GsNative