Add files to question
Refactoring attachments
Refactoring attachments 2