Similar to 1.12, it may be worth it to try to organize and group attachments for an entity type while still splitting them into separate classes, but ones that all lead back to a "parent" class.