Updated attachment types