Implement attachments
strict mode fixes