Updating for Spannable support