Move attachment stuff to AttachmentConverter
Fix NullPointer if updates is not set