Adds initial Attachment support