Fix #12: Fix attachments additional props handling