Added support for attachment fields