redesign Message model
add Token Model