Updated with genericised configs.