diff --git a/src/main/java/org/springframework/integration/aws/support/AbstractMessageAttributesHeaderMapper.java b/src/main/java/org/springframework/integration/aws/support/AbstractMessageAttributesHeaderMapper.java
index 5f8a219..f0bc1a8 100644
--- a/src/main/java/org/springframework/integration/aws/support/AbstractMessageAttributesHeaderMapper.java
+++ b/src/main/java/org/springframework/integration/aws/support/AbstractMessageAttributesHeaderMapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.integration.mapping.HeaderMapper;
import org.springframework.integration.support.utils.PatternMatchUtils;
import org.springframework.messaging.MessageHeaders;
+import org.springframework.messaging.support.NativeMessageHeaderAccessor;
import org.springframework.util.Assert;
import org.springframework.util.MimeType;
import org.springframework.util.NumberUtils;
@@ -41,14 +42,22 @@ import io.awspring.cloud.messaging.core.MessageAttributeDataTypes;
*
* @param the target message attribute type.
* @author Artem Bilan
+ * @author Christopher Smith
* @since 2.0
*/
public abstract class AbstractMessageAttributesHeaderMapper implements HeaderMapper