Improve messages.yml file