Message and Token added to model