Improvements: added default content