Removed attachments table, no longer using.  Updated to generic functions