add aws tag support