Update with last changes in Native