Refactoring Attachment tab