Improved default declaration.
Update notification text.
Improvements in parsing code.