Improving Attachment finder methods