Change to use attachment only when fields do not exist