- simplify message mappers logic