Some more work on config