Fix breaking issue with snippets
Update messages