add support for attachment