Refactored defaults and configuration