Correctly handle different attachment types

Problem/Motivation

Currently attachments are assumed to be an array. This isn't always the case.

Proposed resolution

Handle different attachment types properly to include objects and arrays.