Data: NativeMethodHandler improvements