CMS-2586 Introduce Attachment on Entity