70798066 - Modify mapstructure for Ottemo needs