Updated model to take an attributed string