v2 with attachment support
merge local attachments refactor