Add missing config & readd default setting