Expanded initial config stuff