Slight refactor native core context