Listener done
Some changes in Class Message