Continue with full native sdk refactor