Updated message structure
Changed some messages