Add additionalFilterMapping support from CTO for adorned targets and map structures