Refactor native classes