Changed format to be an instance
Folded attachments category back into entry