Add messages for areas
Fix messages