Fixed pretty output (native); attachments support