Adding support to feature 'attachments'