add native support for Optional in Mapper
2 files changed