#82 avoid dependency to mapstruct-core