Standalone attachments added, need to write unit tests