Update global structure + native solution working