Improvements for end user handling
Add note