Added in attachment stuff