Moved native handler inside Wrapper's module
Moved the native handler
update