Refactor type mapping
2 files changed