Improved notes addition and attachments handling