Added other file types for attachments, still in sorter may abstract fully in 1.1