Attachment and xobject support should indeed most probably be two different issues as it's very different code which needs to be updated.